Remove unsupported versions

commonlit · Nov 6, 2023 · d1b8e95 · d1b8e95
1 parent cad715c
commit d1b8e95
Showing 1 changed file with 55 additions and 62 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -3,7 +3,7 @@ name: Testing
 on:
   push:
     branches:
-      - '**'
+      - "**"
   pull_request:
 
 permissions:
@@ -23,80 +23,73 @@ jobs:
         puma:
           - stable
         rack:
-          - stable
+          - head
         tilt:
           - stable
         # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
-        ruby: [2.6, 2.7, '3.0', 3.1, 3.2, truffleruby]
+        ruby: [3.2]
         include:
           # Rack
-          - { ruby: 3.2, rack: head,   puma: stable,   tilt: stable, allow-failure: true }
-          # Puma
-          - { ruby: 3.2, rack: stable, puma: head,     tilt: stable, allow-failure: true }
-          # Tilt
-          - { ruby: 3.2, rack: stable, puma: stable,   tilt: head, allow-failure: true }
-          # Due to flaky tests, see https://github.com/sinatra/sinatra/pull/1870
-          - { ruby: jruby-9.3, rack: stable, puma: stable, tilt: stable, allow-failure: true }
-          # Due to https://github.com/jruby/jruby/issues/7647
-          - { ruby: jruby-9.4, rack: stable, puma: stable, tilt: stable, allow-failure: true }
-          # Never fail our build due to problems with head
-          - { ruby: ruby-head,        rack: stable, puma: stable, tilt: stable, allow-failure: true }
-          - { ruby: jruby-head,       rack: stable, puma: stable, tilt: stable, allow-failure: true }
-          - { ruby: truffleruby-head, rack: stable, puma: stable, tilt: stable, allow-failure: true }
+          - {
+              ruby: 3.2,
+              rack: head,
+              puma: stable,
+              tilt: stable,
+              allow-failure: true,
+            }
     env:
       rack: ${{ matrix.rack }}
       puma: ${{ matrix.puma }}
       tilt: ${{ matrix.tilt }}
 
     steps:
-    - name: Install dependencies
-      run: |
-        sudo apt-get install --yes \
-          pandoc \
-          nodejs \
-          pkg-config \
-          libxml2-dev \
-          libxslt-dev \
-          libyaml-dev
-    - uses: actions/checkout@v3
-
-    - uses: ruby/setup-ruby@v1
-      continue-on-error: ${{ matrix.allow-failure || false }}
-      id: setup-ruby
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
-        # Update rubygems due to https://github.com/rubygems/rubygems/pull/6490
-        rubygems: ${{ matrix.ruby == '3.0' && 'latest' || 'default' }}
+      - name: Install dependencies
+        run: |
+          sudo apt-get install --yes \
+            pandoc \
+            nodejs \
+            pkg-config \
+            libxml2-dev \
+            libxslt-dev \
+            libyaml-dev
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        continue-on-error: ${{ matrix.allow-failure || false }}
+        id: setup-ruby
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+          # Update rubygems due to https://github.com/rubygems/rubygems/pull/6490
+          rubygems: ${{ matrix.ruby == '3.0' && 'latest' || 'default' }}
 
-    - name: Run sinatra tests
-      continue-on-error: ${{ matrix.allow-failure || false }}
-      id: tests
-      run: bundle exec rake
+      - name: Run sinatra tests
+        continue-on-error: ${{ matrix.allow-failure || false }}
+        id: tests
+        run: bundle exec rake
 
-    - name: Run sinatra-contrib tests
-      continue-on-error: ${{ matrix.allow-failure || false }}
-      id: contrib-tests
-      working-directory: sinatra-contrib
-      run: |
-        bundle install --jobs=3 --retry=3
-        bundle exec rake
-    - name: Run rack-protection tests
-      continue-on-error: ${{ matrix.allow-failure || false }}
-      id: protection-tests
-      working-directory: rack-protection
-      run: |
-        bundle install --jobs=3 --retry=3
-        bundle exec rake
-    # because continue-on-error marks the steps as pass even if they fail
-    - name: "setup-ruby (bundle install) outcome: ${{ steps.setup-ruby.outcome }}"
-      run: ""
-    - name: "sinatra tests outcome: ${{ steps.tests.outcome }}"
-      run: ""
-    - name: "sinatra-contrib tests outcome: ${{ steps.contrib-tests.outcome }}"
-      run: ""
-    - name: "rack-protection tests outcome: ${{ steps.protection-tests.outcome }}"
-      run: ""
+      - name: Run sinatra-contrib tests
+        continue-on-error: ${{ matrix.allow-failure || false }}
+        id: contrib-tests
+        working-directory: sinatra-contrib
+        run: |
+          bundle install --jobs=3 --retry=3
+          bundle exec rake
+      - name: Run rack-protection tests
+        continue-on-error: ${{ matrix.allow-failure || false }}
+        id: protection-tests
+        working-directory: rack-protection
+        run: |
+          bundle install --jobs=3 --retry=3
+          bundle exec rake
+      # because continue-on-error marks the steps as pass even if they fail
+      - name: "setup-ruby (bundle install) outcome: ${{ steps.setup-ruby.outcome }}"
+        run: ""
+      - name: "sinatra tests outcome: ${{ steps.tests.outcome }}"
+        run: ""
+      - name: "sinatra-contrib tests outcome: ${{ steps.contrib-tests.outcome }}"
+        run: ""
+      - name: "rack-protection tests outcome: ${{ steps.protection-tests.outcome }}"
+        run: ""
 
     - uses: zzak/action-discord@v6
       if: failure() && github.ref_name == 'main'