From 31abf433a9d2b65f512a3b3ed3372883ef130ca6 Mon Sep 17 00:00:00 2001 From: Marc Anguera Insa Date: Tue, 8 Oct 2024 10:55:19 +0200 Subject: [PATCH 1/2] Remove official support for Ruby 2.5 and 2.6 --- .github/workflows/ci.yml | 8 ++++++-- Gemfile | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3034d7e..c62e455 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,10 @@ name: CI -on: [push] +on: + push: + branches: [master] + pull_request: + branches: [master] jobs: test: @@ -9,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - ruby-version: ["3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5"] + ruby-version: ["3.3", "3.2", "3.1", "3.0", "2.7"] steps: - uses: actions/checkout@v4 - name: Set up Ruby diff --git a/Gemfile b/Gemfile index 0f16a17..b2524c4 100644 --- a/Gemfile +++ b/Gemfile @@ -15,13 +15,13 @@ gem 'yard', '~> 0.9', require: false # Test tools gem 'aruba', '~> 1.0', require: false gem 'capybara', '~> 3', require: false -gem 'cucumber', '~> 3.0', require: false +gem 'cucumber', require: false gem 'rspec', '~> 3.0', require: false gem 'timecop', '~> 0.6', require: false # Optional dependencies, included for tests gem 'kramdown' -gem 'nokogiri', RUBY_VERSION < '2.6' ? '~> 1.12.0' : '>= 0', require: false +gem 'rack', '< 3' # Code Quality gem 'rubocop', require: false From 92de073d83b196f75150b3042df6abdab38b279a Mon Sep 17 00:00:00 2001 From: Marc Anguera Insa Date: Tue, 8 Oct 2024 11:05:28 +0200 Subject: [PATCH 2/2] fix activesupport for rubies < 3.1 --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index b2524c4..b42795c 100644 --- a/Gemfile +++ b/Gemfile @@ -22,6 +22,7 @@ gem 'timecop', '~> 0.6', require: false # Optional dependencies, included for tests gem 'kramdown' gem 'rack', '< 3' +gem 'activesupport', RUBY_VERSION < '3.1' ? '< 7.1' : '>= 0' # Code Quality gem 'rubocop', require: false