From f0a6d171372cf1efc9ef057d65a3244e10fb2060 Mon Sep 17 00:00:00 2001 From: Lukas Audzevicius Date: Wed, 1 Apr 2026 13:41:12 +0100 Subject: [PATCH 1/3] (CAT-2594) Prepare for Puppetcore 9 With the arrival of Puppetcore 9, we need to ensure that our tools are compatible with Ruby 4. This commit updates our CI workflow to test against Ruby 4. --- .github/workflows/ci.yml | 3 +++ .github/workflows/nightly.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 307ae721..b0b8fdee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,9 +19,12 @@ jobs: matrix: ruby_version: - "3.2" + - "4.0" include: - ruby_version: '3.2' puppet_gem_version: '~> 8.0' + - ruby_version: '4.0' + puppet_gem_version: '~> 9.0' runs_on: - "ubuntu-latest" - "windows-latest" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index fb1e4e50..900c9623 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -12,9 +12,12 @@ jobs: matrix: ruby_version: - "3.2" + - "4.0" include: - ruby_version: '3.2' puppet_gem_version: '~> 8.0' + - ruby_version: '4.0' + puppet_gem_version: '~> 9.0' runs_on: - "ubuntu-latest" - "windows-latest" From c70f78709c217ffacde26203723dda5da6d20a25 Mon Sep 17 00:00:00 2001 From: Lukas Audzevicius Date: Wed, 1 Apr 2026 15:10:28 +0100 Subject: [PATCH 2/3] Enable puppetcore packages --- Gemfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 6252a780..74343c7c 100644 --- a/Gemfile +++ b/Gemfile @@ -25,7 +25,10 @@ end group :test do gem 'facter', *location_for(ENV.fetch('FACTER_GEM_VERSION', nil)) - gem 'puppet', *location_for(ENV.fetch('PUPPET_GEM_VERSION', nil)) + + source 'https://rubygems-puppetcore.puppet.com' do + gem 'puppetcore', *location_for(ENV.fetch('PUPPET_GEM_VERSION', nil)) + end gem 'json_pure' gem 'sync' From 89fb1576d2b9bfc835a00280a96676a95ef0b88c Mon Sep 17 00:00:00 2001 From: Lukas Audzevicius Date: Wed, 1 Apr 2026 15:26:15 +0100 Subject: [PATCH 3/3] fixup --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 74343c7c..4fb450c3 100644 --- a/Gemfile +++ b/Gemfile @@ -27,7 +27,7 @@ group :test do gem 'facter', *location_for(ENV.fetch('FACTER_GEM_VERSION', nil)) source 'https://rubygems-puppetcore.puppet.com' do - gem 'puppetcore', *location_for(ENV.fetch('PUPPET_GEM_VERSION', nil)) + gem 'puppet', *location_for(ENV.fetch('PUPPET_GEM_VERSION', nil)) end gem 'json_pure'