Merge pull request #1835 from dentarg/puma-edge-job

CI: Test with Puma 6 but allow it to fail
sinatra · Nov 8, 2022 · 44ff149 · 44ff149
2 parents edaca03 + e328d08
commit 44ff149
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,21 +8,25 @@ on:
 
 jobs:
   test:
-    name: Ruby ${{ matrix.ruby }} (Rack ${{ matrix.rack }})
+    name: ${{ matrix.ruby }} (Rack ${{ matrix.rack }}, Puma ${{ matrix.puma }})
     runs-on: ubuntu-latest
     timeout-minutes: 15
     strategy:
       fail-fast: false
       matrix:
+        puma:
+          - '~> 5' # Due to https://github.com/puma/puma/issues/3000
         rack:
           - 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, 'jruby-9.3', truffleruby, truffleruby-head]
         include:
-          - { ruby: 3.1, rack: main, allow-failure: true }
+          - { ruby: 3.1, rack: stable, puma: latest, allow-failure: true }
+          - { ruby: 3.1, rack: latest, allow-failure: true }
           - { ruby: jruby-head, rack: stable, allow-failure: true }
     env:
       rack: ${{ matrix.rack }}
+      puma: ${{ matrix.puma }}
     steps:
     - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1

diff --git a/Gemfile b/Gemfile
@@ -15,9 +15,14 @@ gem 'rake'
 
 rack_version = ENV['rack'].to_s
 rack_version = nil if rack_version.empty? || (rack_version == 'stable')
-rack_version = { github: 'rack/rack' } if rack_version == 'main'
+rack_version = { github: 'rack/rack' } if rack_version == 'latest'
 gem 'rack', rack_version
 
+puma_version = ENV['puma'].to_s
+puma_version = nil if puma_version.empty? || (puma_version == 'stable')
+puma_version = { github: 'puma/puma' } if puma_version == 'latest'
+gem 'puma', puma_version
+
 gem 'minitest', '~> 5.0'
 gem 'rack-test', github: 'rack/rack-test'
 gem 'rubocop', '~> 1.32.0', require: false
@@ -40,7 +45,6 @@ gem 'liquid'
 gem 'markaby'
 gem 'nokogiri', '> 1.5.0'
 gem 'pandoc-ruby', '~> 2.0.2'
-gem 'puma', '~> 5'
 gem 'rabl'
 gem 'rainbows', platforms: [:mri] # uses #fork
 gem 'rdiscount', platforms: [:ruby]