From 811ecf2b6ba022f1a32d41eb3f3e57fffe88f1d7 Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Mon, 1 Jul 2024 15:54:43 -0700 Subject: [PATCH 1/2] Use bundler-cache This commit updates the nightly unit test workflow to use the setup-ruby action's built-in bundler-cache job to install gems. See also: puppetlabs/puppet@86820ee --- .../workflows/unit_tests_with_released_puppet_gem.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/unit_tests_with_released_puppet_gem.yaml b/.github/workflows/unit_tests_with_released_puppet_gem.yaml index c90ab2d..6cffbbc 100644 --- a/.github/workflows/unit_tests_with_released_puppet_gem.yaml +++ b/.github/workflows/unit_tests_with_released_puppet_gem.yaml @@ -34,13 +34,7 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} - - - name: Prepare testing environment with bundler - run: | - git config --global core.longpaths true - bundle config set system 'true' - bundle config set --local without 'release' - bundle update --jobs 4 --retry 3 + bundler-cache: true - name: Run unit tests run: bundle exec rake parallel_spec From 47c87e43ce4b6d2b624229b3ffdd0ccecc99523e Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Mon, 1 Jul 2024 16:10:22 -0700 Subject: [PATCH 2/2] Update FFI gem --- .github/workflows/unit_tests_with_nightly_puppet_gem.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml b/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml index 9dc8110..1696664 100644 --- a/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml +++ b/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml @@ -29,9 +29,10 @@ jobs: env_set_cmd: '$env:' # setup-ruby uses ucrt for newer Rubies, but we only support mingw # in our Windows Puppet nightly gems. For now, we'll just install - # the universal gem and manually install the ffi dependency + # the universal gem and manually install the ffi dependency. + # Use the latest known good version of the ffi gem. gem_file: 'puppet-latest.gem' - extra_steps: 'gem install ffi --version 1.15.5' + extra_steps: 'gem install ffi --version 1.16.3' runs-on: ${{ matrix.os }} steps: