Merge 2e0986f into baed6e8

collectiveidea · Apr 6, 2021 · 0be1150 · 0be1150
2 parents baed6e8 + 2e0986f
commit 0be1150
Showing 1 changed file with 43 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,46 +9,68 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental || false }}
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.5, 2.6, 2.7, jruby, jruby-head, ruby-head]
+        ruby:
+          - '2.5'
+          - '2.6'
+          - '2.7'
+          - '3.0'
+          - 'jruby'
         rails_version:
-          - '5.2.0'
-          - '6.0.0'
-          - '6.1.0.rc2'
-          - 'edge'
+          - '6.0'
+          - '6.1'
         include:
-          #
-          # The past
-          #
-          # EOL Active Record
-          - ruby: 2.2
-            rails_version: '3.2.0'
-          - ruby: 2.1
-            rails_version: '4.1.0'
-          - ruby: 2.4
-            rails_version: '4.2.0'
-          - ruby: 2.4
-            rails_version: '5.0.0'
-          - ruby: 2.5
-            rails_version: '5.1.0'
-
-    continue-on-error: ${{ matrix.rails_version == 'edge' || endsWith(matrix.ruby, 'head') }}
+          # Older Rails
+          - ruby: '2.2'
+            rails_version: '3.2'
+          - ruby: '2.1'
+            rails_version: '4.1'
+          - ruby: '2.4'
+            rails_version: '4.2'
+          - ruby: '2.4'
+            rails_version: '5.0'
+          - ruby: '2.5'
+            rails_version: '5.1'
+          - ruby: '2.5'
+            rails_version: '5.2'
+          - ruby: 'jruby'
+            rails_version: '5.2'
+          # Experimental
+          - ruby: 'ruby-head'
+            rails_version: '6.1'
+            experimental: true
+          - ruby: 'jruby-head'
+            rails_version: '6.1'
+            experimental: true
+          - ruby: '2.7'
+            rails_version: 'edge'
+            experimental: true
+          - ruby: '3.0'
+            rails_version: 'edge'
+            experimental: true
+          - ruby: 'jruby'
+            rails_version: 'edge'
+            experimental: true
 
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
+      continue-on-error: ${{ matrix.experimental || false }}
       env:
         RAILS_VERSION: ${{ matrix.rails_version }}
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - name: Run tests
+      continue-on-error: ${{ matrix.experimental || false }}
       env:
         RAILS_VERSION: ${{ matrix.rails_version }}
       run: bundle exec rspec
     - name: Coveralls Parallel
+      continue-on-error: ${{ matrix.experimental || false }}
       uses: coverallsapp/github-action@master
       with:
         github-token: ${{ secrets.github_token }}