From 2837b51431150279aa2134730a1746b783144f8a Mon Sep 17 00:00:00 2001 From: MSP-Greg Date: Thu, 13 Jan 2022 14:11:46 -0600 Subject: [PATCH 1/2] Update Actions --- .github/workflows/mri.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mri.yml b/.github/workflows/mri.yml index 5cb3ec7841..922dbe8fa4 100644 --- a/.github/workflows/mri.yml +++ b/.github/workflows/mri.yml @@ -44,14 +44,14 @@ jobs: uses: actions/checkout@v2 - name: load ruby - uses: MSP-Greg/setup-ruby-pkgs@win-ucrt-2 + uses: MSP-Greg/setup-ruby-pkgs@v1 with: ruby-version: ${{ matrix.ruby }} apt-get: ragel brew: ragel mingw: openssl ragel bundler-cache: true - setup-ruby-ref: MSP-Greg/ruby-setup-ruby/win-ucrt-1 + setup-ruby-ref: MSP-Greg/ruby-setup-ruby/gem-update timeout-minutes: 10 # Windows error thrown, doesn't affect CI From 0e7ad5d3088563163cebcc4e2aafa52b9d049d6e Mon Sep 17 00:00:00 2001 From: MSP-Greg Date: Sun, 16 Jan 2022 11:55:28 -0600 Subject: [PATCH 2/2] TestIntegrationPumactl#test_phased_restart_cluster - time to 6 Fixes rare failures on Ubuntu 18.04 --- test/test_integration_pumactl.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_integration_pumactl.rb b/test/test_integration_pumactl.rb index babf98cae8..fa1a830283 100644 --- a/test/test_integration_pumactl.rb +++ b/test/test_integration_pumactl.rb @@ -89,7 +89,7 @@ def test_phased_restart_cluster _, status = Process.wait2(@pid) assert_equal 0, status - assert_operator Time.now - start, :<, (DARWIN ? 8 : 5) + assert_operator Time.now - start, :<, (DARWIN ? 8 : 6) @server = nil end