From 53547aa079e99b22e84a386920593133a7e3a5b7 Mon Sep 17 00:00:00 2001
From: Geoff Harcourt <geoff.harcourt@gmail.com>
Date: Mon, 6 Nov 2023 17:40:01 -0500
Subject: [PATCH] Remove unsupported versions

---
 .github/workflows/test.yml | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0af70a068..56fdbd48a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,31 +23,17 @@ 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: false }
     env:
       rack: ${{ matrix.rack }}
       puma: ${{ matrix.puma }}
       tilt: ${{ matrix.tilt }}
-
     steps:
     - name: Install dependencies
       run: |
@@ -58,6 +44,7 @@ jobs:
           libxml2-dev \
           libxslt-dev \
           libyaml-dev
+
     - uses: actions/checkout@v3
 
     - uses: ruby/setup-ruby@v1
@@ -81,6 +68,7 @@ jobs:
       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