From beefb4a959a1c1b2fce89d5756f9a4dc484e16ca Mon Sep 17 00:00:00 2001 From: Fabian Schwahn Date: Tue, 23 Jan 2024 09:45:09 +0100 Subject: [PATCH 1/2] Fix CI by pinning loofah in older rails versions --- Appraisals | 2 ++ gemfiles/rails_4.2.gemfile | 1 + gemfiles/rails_5.2.gemfile | 1 + 3 files changed, 4 insertions(+) diff --git a/Appraisals b/Appraisals index 5760108..c78700d 100644 --- a/Appraisals +++ b/Appraisals @@ -2,10 +2,12 @@ appraise "rails_4.2" do gem "rails", "~> 4.2.10" gem "rspec-rails", "~> 3.0" gem "sqlite3", "~> 1.3.6" + gem "loofah", "~> 2.20.0" end appraise "rails_5.2" do gem "rails", "~> 5.2.0" + gem "loofah", "~> 2.20.0" end appraise "rails_6.0" do diff --git a/gemfiles/rails_4.2.gemfile b/gemfiles/rails_4.2.gemfile index 12cb759..0ae2757 100644 --- a/gemfiles/rails_4.2.gemfile +++ b/gemfiles/rails_4.2.gemfile @@ -5,5 +5,6 @@ source "https://rubygems.org" gem "rails", "~> 4.2.10" gem "rspec-rails", "~> 3.0" gem "sqlite3", "~> 1.3.6" +gem "loofah", "~> 2.20.0" gemspec path: "../" diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile index 5a706dc..aa77e71 100644 --- a/gemfiles/rails_5.2.gemfile +++ b/gemfiles/rails_5.2.gemfile @@ -3,5 +3,6 @@ source "https://rubygems.org" gem "rails", "~> 5.2.0" +gem "loofah", "~> 2.20.0" gemspec path: "../" From 806c4840a02c53a690b4d3726955a74d0cc82483 Mon Sep 17 00:00:00 2001 From: Fabian Schwahn Date: Tue, 23 Jan 2024 09:57:17 +0100 Subject: [PATCH 2/2] Add rails 7.1 to CI --- .github/workflows/ruby.yml | 5 +++++ Appraisals | 4 ++++ gemfiles/rails_7.1.gemfile | 7 +++++++ 3 files changed, 16 insertions(+) create mode 100644 gemfiles/rails_7.1.gemfile diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 4116e8d..1f7c0da 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -23,6 +23,7 @@ jobs: - rails_6.0.gemfile - rails_6.1.gemfile - rails_7.0.gemfile + - rails_7.1.gemfile include: - ruby-version: '2.4' gemfile: rails_4.2.gemfile @@ -48,6 +49,10 @@ jobs: gemfile: rails_6.1.gemfile - ruby-version: '2.4' gemfile: rails_7.0.gemfile + - ruby-version: '2.4' + gemfile: rails_7.1.gemfile + - ruby-version: '2.7' + gemfile: rails_7.1.gemfile env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }} diff --git a/Appraisals b/Appraisals index c78700d..50b55d4 100644 --- a/Appraisals +++ b/Appraisals @@ -21,3 +21,7 @@ end appraise "rails_7.0" do gem "rails", "~> 7.0.0" end + +appraise "rails_7.1" do + gem "rails", "~> 7.1.0" +end diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile new file mode 100644 index 0000000..35a0ba3 --- /dev/null +++ b/gemfiles/rails_7.1.gemfile @@ -0,0 +1,7 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 7.1.0" + +gemspec path: "../"