From 038ea932c2ca33eecce3e982664368826fa361e9 Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Fri, 26 Jul 2024 10:56:05 -0700 Subject: [PATCH 1/2] Update JRuby to 9.3.14.0 Puppetserver uses JRuby 9.3.14.0 in the 7.x stream. We use that version of JRuby in unit tests, but we use an older version in integration tests. This commit updates integration tests from JRuby 9.3.9.0 to 9.3.14.0. --- .github/workflows/integration_tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration_tests.yaml b/.github/workflows/integration_tests.yaml index fc2324ed65..7982b53652 100644 --- a/.github/workflows/integration_tests.yaml +++ b/.github/workflows/integration_tests.yaml @@ -20,7 +20,7 @@ jobs: cfg: - {os: ubuntu-latest, ruby: '2.7'} - {os: ubuntu-22.04, ruby: '3.2'} # with openssl 3 - - {os: ubuntu-22.04, ruby: 'jruby-9.3.9.0'} + - {os: ubuntu-22.04, ruby: 'jruby-9.3.14.0'} - {os: windows-2019, ruby: '2.7'} - {os: windows-2019, ruby: '3.2'} # with openssl 3 runs-on: ${{ matrix.cfg.os }} From 38b500842276acbec4478e506b7ce9dc89fe4375 Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Fri, 26 Jul 2024 10:58:36 -0700 Subject: [PATCH 2/2] Update JRuby to 9.4.8.0 Puppetserver recently updated the JRuby version used in the 8.x stream from JRuby 9.4.7.0 to 9.4.8.0: puppetlabs/jruby-utils@0e23173 This commit updates Facter's tests to JRuby 9.4.8.0 to match. --- .github/workflows/unit_tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml index 5d9100be9f..cd0ee2bc5f 100644 --- a/.github/workflows/unit_tests.yaml +++ b/.github/workflows/unit_tests.yaml @@ -23,7 +23,7 @@ jobs: - '3.0' - '3.2' - 'jruby-9.3.14.0' - - 'jruby-9.4.7.0' + - 'jruby-9.4.8.0' runs-on: ubuntu-20.04 steps: - name: Checkout current PR