Merge branch 'master' into theme-color

ricoThaka · Jul 16, 2021 · 4eff3e0 · 4eff3e0
2 parents 697146f + b37cc36
commit 4eff3e0
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 28 deletions.
diff --git a/.github/settings.yml b/.github/settings.yml
@@ -26,6 +26,6 @@ branch_protection:
   required_status_checks:
     strict: true
     contexts:
-      - "continuous-integration/travis-ci"
+      - "script/cibuild" # GitHub Actions CI workflow
   required_pull_request_reviews:
     require_code_owner_reviews: true
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,13 +1,17 @@
-on: push
+on:
+  push:
+  pull_request:
+    types: [opened, synchronize]
 jobs:
   build:
     runs-on: ubuntu-latest
     name: script/cibuild
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.7
+          bundler-cache: true
       - name: build
         run: script/bootstrap
       - name: test

diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ _site
 .sass-cache
 Gemfile.lock
 *.gem
+.jekyll-cache
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,9 +1,11 @@
+inherit_gem:
+  rubocop-github:
+    - config/default.yml
+
 AllCops:
   Exclude:
     - _site/**/*
+    - vendor/**/*
 
-Metrics/LineLength:
-  Enabled: false
-
-Gemspec/RequiredRubyVersion:
+Layout/LineLength:
   Enabled: false
diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # The Hacker theme
 
-[![Build Status](https://travis-ci.org/pages-themes/hacker.svg?branch=master)](https://travis-ci.org/pages-themes/hacker) [![Gem Version](https://badge.fury.io/rb/jekyll-theme-hacker.svg)](https://badge.fury.io/rb/jekyll-theme-hacker)
+[Build Status](https://github.com/pages-themes/hacker/actions/workflows/ci.yaml) [![Gem Version](https://badge.fury.io/rb/jekyll-theme-hacker.svg)](https://badge.fury.io/rb/jekyll-theme-hacker)
 
 *Hacker is a Jekyll theme for GitHub Pages. You can [preview the theme to see what it looks like](http://pages-themes.github.io/hacker), or even [use it today](#usage).*
 

diff --git a/jekyll-theme-hacker.gemspec b/jekyll-theme-hacker.gemspec
@@ -1,22 +1,24 @@
 # frozen_string_literal: true
 
 Gem::Specification.new do |s|
-  s.name          = 'jekyll-theme-hacker'
-  s.version       = '0.1.2'
-  s.license       = 'CC0-1.0'
-  s.authors       = ['Jason Costello', 'GitHub, Inc.']
-  s.email         = ['opensource+jekyll-theme-hacker@github.com']
-  s.homepage      = 'https://github.com/pages-themes/hacker'
-  s.summary       = 'Hacker is a Jekyll theme for GitHub Pages'
+  s.name          = "jekyll-theme-hacker"
+  s.version       = "0.1.2"
+  s.license       = "CC0-1.0"
+  s.authors       = ["Jason Costello", "GitHub, Inc."]
+  s.email         = ["opensource+jekyll-theme-hacker@github.com"]
+  s.homepage      = "https://github.com/pages-themes/hacker"
+  s.summary       = "Hacker is a Jekyll theme for GitHub Pages"
 
   s.files         = `git ls-files -z`.split("\x0").select do |f|
     f.match(%r{^((_includes|_layouts|_sass|assets)/|(LICENSE|README)((\.(txt|md|markdown)|$)))}i)
   end
 
+  s.required_ruby_version = ">= 2.4.0"
+
   s.platform = Gem::Platform::RUBY
-  s.add_runtime_dependency 'jekyll', '> 3.5', '< 5.0'
-  s.add_runtime_dependency 'jekyll-seo-tag', '~> 2.0'
-  s.add_development_dependency 'html-proofer', '~> 3.0'
-  s.add_development_dependency 'rubocop', '~> 0.50'
-  s.add_development_dependency 'w3c_validators', '~> 1.3'
+  s.add_runtime_dependency "jekyll", "> 3.5", "< 5.0"
+  s.add_runtime_dependency "jekyll-seo-tag", "~> 2.0"
+  s.add_development_dependency "html-proofer", "~> 3.0"
+  s.add_development_dependency "rubocop-github", "~> 0.16"
+  s.add_development_dependency "w3c_validators", "~> 1.3"
 end
diff --git a/script/cibuild b/script/cibuild
@@ -4,6 +4,6 @@ set -e
 
 bundle exec jekyll build
 bundle exec htmlproofer ./_site --check-html --check-sri
-bundle exec rubocop -D
+bundle exec rubocop -D --config .rubocop.yml
 bundle exec script/validate-html
 gem build jekyll-theme-hacker.gemspec
diff --git a/script/validate-html b/script/validate-html
@@ -1,13 +1,13 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'w3c_validators'
+require "w3c_validators"
 
 def validator(file)
   extension = File.extname(file)
-  if extension == '.html'
+  if extension == ".html"
     W3CValidators::NuValidator.new
-  elsif extension == '.css'
+  elsif extension == ".css"
     W3CValidators::CSSValidator.new
   end
 end
@@ -18,11 +18,11 @@ def validate(file)
   path = File.expand_path "../_site/#{file}", __dir__
   results = validator(file).validate_file(path)
 
-  return puts 'Valid!' if results.errors.empty?
+  return puts "Valid!" if results.errors.empty?
 
   results.errors.each { |err| puts err.to_s }
   exit 1
 end
 
-validate 'index.html'
-validate File.join 'assets', 'css', 'style.css'
+validate "index.html"
+validate File.join "assets", "css", "style.css"