Merge pull request #786 from bugsnag/fix-ci

Fix CI
bugsnag · Jul 19, 2023 · 90ef7dd · 90ef7dd
2 parents e5afde5 + 3828228
commit 90ef7dd
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/.github/workflows/test-package.yml b/.github/workflows/test-package.yml
@@ -4,12 +4,12 @@ on: [push, pull_request]
 
 jobs:
   specs:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os || 'ubuntu-latest' }}
 
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['2.2', '2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2']
+        ruby-version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2']
         optional-groups: ['test sidekiq']
         include:
           - ruby-version: '1.9'
@@ -18,6 +18,9 @@ jobs:
             optional-groups: 'test'
           - ruby-version: '2.1'
             optional-groups: 'test'
+          - ruby-version: '2.2'
+            optional-groups: 'test sidekiq'
+            os: 'ubuntu-20.04'
           - ruby-version: 'jruby'
             optional-groups: 'test'
 

diff --git a/features/fixtures/rails3/app/Gemfile b/features/fixtures/rails3/app/Gemfile
@@ -15,3 +15,6 @@ gem 'bugsnag', path: '/bugsnag'
 gem 'rack-cache', '~> 1.9.0'
 
 gem "warden"
+
+# Install a compatible Loofah version on Ruby <2.5
+gem 'loofah', '2.20.0' if RUBY_VERSION < '2.5'
diff --git a/features/fixtures/rails4/app/Gemfile b/features/fixtures/rails4/app/Gemfile
@@ -43,4 +43,7 @@ gem 'devise'
 
 gem "mongoid", '~> 5.4.0'
 
-gem "nokogiri", "1.6.8"
+gem "nokogiri", "1.6.8"
+
+# Install a compatible Loofah version
+gem 'loofah', '2.20.0'
diff --git a/features/fixtures/rails5/app/Gemfile b/features/fixtures/rails5/app/Gemfile
@@ -50,3 +50,6 @@ gem "clearance",  ruby_version < Gem::Version.new('2.3.0') ? '1.16.1' : '~> 1.16
 gem "mongoid"
 
 gem "nokogiri", "1.6.8"
+
+# Install a compatible Loofah version
+gem 'loofah', '2.20.0'