From 6b0ff73019dcbc082db33abad1b7b6b29b7aa127 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Sun, 22 Sep 2024 18:02:02 +0530 Subject: [PATCH 1/6] Bump versions in CI workflow --- .github/workflows/ci.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b6072a2..e2a029a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,8 +21,9 @@ jobs: - 2.5 - 2.7 - 3.0 + - 3.3 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 5 - name: "Set up Ruby ${{ matrix.ruby_version }}" @@ -41,20 +42,20 @@ jobs: ghp: if: "!contains(github.event.commits[0].message, '[ci skip]')" - name: Ruby 2.7 with GitHub Pages Gem + name: Ruby 3.3 with GitHub Pages Gem runs-on: 'ubuntu-latest' env: GH_PAGES: true strategy: fail-fast: false steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 5 - - name: "Set up Ruby 2.7" + - name: "Set up Ruby 3.3" uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: 3.3 bundler-cache: true - name: Execute tests run: bash script/test From bc0aecf5d64bca08dcea74ff41c9834ce35c4061 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Sun, 22 Sep 2024 18:08:04 +0530 Subject: [PATCH 2/6] Bump version of dev-dependency `rubocop-jekyll` --- jekyll-redirect-from.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jekyll-redirect-from.gemspec b/jekyll-redirect-from.gemspec index 56ba1e9..583ac25 100644 --- a/jekyll-redirect-from.gemspec +++ b/jekyll-redirect-from.gemspec @@ -22,5 +22,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "jekyll-sitemap", "~> 1.0" spec.add_development_dependency "rake", "~> 12.0" spec.add_development_dependency "rspec", "~> 3.5" - spec.add_development_dependency "rubocop-jekyll", "~> 0.12.0" + spec.add_development_dependency "rubocop-jekyll", "~> 0.13.0" end From 864103b06237ac6ef21af7bbc365a40b73073aa0 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Sun, 22 Sep 2024 18:50:46 +0530 Subject: [PATCH 3/6] Disable `Style/ConcatArrayLiterals` cop in gemspec --- .rubocop.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.rubocop.yml b/.rubocop.yml index dc87809..64db333 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -30,6 +30,9 @@ Performance/RedundantEqualityComparisonBlock: Performance/RedundantSplitRegexpArgument: Enabled: true +Style/ConcatArrayLiterals: + Exclude: + - 'jekyll-redirect-from.gemspec' Style/InPatternThen: Enabled: false Style/MultilineInPatternThen: From 80839cbdf7d66f02f90590b6a460ec3201b53136 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Sun, 22 Sep 2024 18:53:05 +0530 Subject: [PATCH 4/6] Stringify Ruby versions in workflow config --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e2a029a..15f1072 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,10 +18,10 @@ jobs: fail-fast: false matrix: ruby_version: - - 2.5 - - 2.7 - - 3.0 - - 3.3 + - "2.5" + - "2.7" + - "3.0" + - "3.3" steps: - uses: actions/checkout@v4 with: From 8381628e7a096551fc952afd61e21faa36b89424 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Sun, 22 Sep 2024 19:02:17 +0530 Subject: [PATCH 5/6] Stop testing with Ruby older than 2.7.0 `rubocop-jekyll-0.13.0` requires at least Ruby 2.7.0 --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 15f1072..42b69f5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,6 @@ jobs: fail-fast: false matrix: ruby_version: - - "2.5" - "2.7" - "3.0" - "3.3" From a4b07889f5c3d851c3dd2e17ef6cd1751a97afef Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Sun, 22 Sep 2024 19:07:18 +0530 Subject: [PATCH 6/6] Bump dev-dependency `rake` to v13.x --- jekyll-redirect-from.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jekyll-redirect-from.gemspec b/jekyll-redirect-from.gemspec index 583ac25..713ef0b 100644 --- a/jekyll-redirect-from.gemspec +++ b/jekyll-redirect-from.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler" spec.add_development_dependency "jekyll-sitemap", "~> 1.0" - spec.add_development_dependency "rake", "~> 12.0" + spec.add_development_dependency "rake", "~> 13.0" spec.add_development_dependency "rspec", "~> 3.5" spec.add_development_dependency "rubocop-jekyll", "~> 0.13.0" end