Fix the CI [changelog skip] (puma#2214)

* Skip TestThreadPool#test_trim_leaves_min on JRuby * It fails frequently there too. * Use Bundler 1 in CI * Using Bundler 2 seems to cause several failures: https://github.com/puma/puma/runs/553627446
ayufan-research · Apr 2, 2020 · b1c27ee · b1c27ee
1 parent a6dcb50
commit b1c27ee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -28,6 +28,7 @@ jobs:
         uses: MSP-Greg/setup-ruby-pkgs@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+          bundler: 1
           apt-get: ragel
           brew: ragel
 

diff --git a/test/test_thread_pool.rb b/test/test_thread_pool.rb
@@ -87,7 +87,7 @@ def test_trim
   end
 
   def test_trim_leaves_min
-    skip_on :truffleruby # Undiagnose thread race. TODO fix
+    skip_on :jruby, :truffleruby # Undiagnose thread race. TODO fix
     pool = new_pool(1, 2) do |work|
       @work_mutex.synchronize do
         @work_done.signal