Skip to content

Commit

Permalink
Support Jekyll v3.9 and v4.1 / Modify workflow trigger event (#121)
Browse files Browse the repository at this point in the history
* Add `on: pull_reqeust`

* Support jekyll 3.9

* Add supprot jekyll 4.1

* Exclude Ruby 2.4 x Jekyll 4.1
  • Loading branch information
toshimaru committed Oct 12, 2020
1 parent 7ce8677 commit 5c93fa9
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 10 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
name: CI
on: [push]
on: [push, pull_request]
jobs:
build:
strategy:
matrix:
ruby: [2.4, 2.5, 2.6, 2.7]
gemfile:
- gemfiles/jekyll_4.0.gemfile
- gemfiles/jekyll_3.8.gemfile
- gemfiles/jekyll_3.8.gemfile
- gemfiles/jekyll_3.9.gemfile
- gemfiles/jekyll_4.0.gemfile
- gemfiles/jekyll_4.1.gemfile
exclude:
- ruby: 2.4
gemfile: gemfiles/jekyll_4.0.gemfile
- ruby: 2.4
gemfile: gemfiles/jekyll_4.1.gemfile
env:
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Coverage
on: [push]
on: [push, pull_request]
jobs:
build:
strategy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: RuboCop
on: [push]
on: [push, pull_request]
jobs:
build:
strategy:
Expand Down
10 changes: 5 additions & 5 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# frozen_string_literal: true

appraise 'jekyll-4.0' do
gem 'jekyll', '4.0'
end
SUPPORTED_VERSIONS = %w[3.8 3.9 4.0 4.1].freeze

appraise 'jekyll-3.8' do
gem 'jekyll', '3.8'
SUPPORTED_VERSIONS.each do |version|
appraise "jekyll-#{version}" do
gem 'jekyll', version
end
end
14 changes: 14 additions & 0 deletions gemfiles/jekyll_3.9.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "appraisal"
gem "minitest-reporters"
gem "minitest"
gem "pry"
gem "rake"
gem "rubocop", "~> 0.81"
gem "simplecov", "~> 0.17.1"
gem "jekyll", "3.9"

gemspec path: "../"
14 changes: 14 additions & 0 deletions gemfiles/jekyll_4.1.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "appraisal"
gem "minitest-reporters"
gem "minitest"
gem "pry"
gem "rake"
gem "rubocop", "~> 0.81"
gem "simplecov", "~> 0.17.1"
gem "jekyll", "4.1"

gemspec path: "../"

0 comments on commit 5c93fa9

Please sign in to comment.