From 8c08f1fa96d11ff39ec377495707e2fb4cebf66f Mon Sep 17 00:00:00 2001
From: Josh Cooper <joshcooper@users.noreply.github.com>
Date: Fri, 1 May 2026 10:24:08 -0700
Subject: [PATCH 1/3] Change mend product

Bump ruby version and enable bundler cache
---
 .github/workflows/mend.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/mend.yaml b/.github/workflows/mend.yaml
index 2b94c18..8d080ef 100644
--- a/.github/workflows/mend.yaml
+++ b/.github/workflows/mend.yaml
@@ -15,7 +15,8 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 3.3
+          bundler-cache: true
       - name: Create lock
         run: bundle lock
       - uses: actions/setup-java@v3
@@ -30,5 +31,5 @@ jobs:
           WS_APIKEY: ${{ secrets.MEND_API_KEY }}
           WS_WSS_URL: https://saas-eu.whitesourcesoftware.com/agent
           WS_USERKEY: ${{ secrets.MEND_TOKEN }}
-          WS_PRODUCTNAME: Puppet Agent
+          WS_PRODUCTNAME: Puppet Core
           WS_PROJECTNAME: ${{ github.event.repository.name }}

From b70b1fd0c1381d87d73a9c70f0d935d32843ccfb Mon Sep 17 00:00:00 2001
From: Josh Cooper <joshcooper@users.noreply.github.com>
Date: Fri, 1 May 2026 10:26:37 -0700
Subject: [PATCH 2/3] Resolve conflicting rspec requirements

---
 Gemfile       | 4 ----
 hocon.gemspec | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0fc8381..8d3bc77 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in hocon.gemspec
 gemspec
-
-group :tests do
-  gem 'rspec', '~> 3.0'
-end
diff --git a/hocon.gemspec b/hocon.gemspec
index 3b0eb47..31c5b65 100644
--- a/hocon.gemspec
+++ b/hocon.gemspec
@@ -17,5 +17,5 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>=1.9.0'
 
   # Testing dependencies
-  s.add_development_dependency 'rspec', '~> 2.14'
+  s.add_development_dependency 'rspec', '~> 3.0'
 end

From 4d166a70ab9202260cf50b2abf1ae79c5c0427af Mon Sep 17 00:00:00 2001
From: Josh Cooper <joshcooper@users.noreply.github.com>
Date: Fri, 1 May 2026 10:32:20 -0700
Subject: [PATCH 3/3] Update rspec matrix

Drop ruby 2.7, add 4.0

Don't gem update

Enable bundler cache
---
 .github/workflows/rspec_tests.yaml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/rspec_tests.yaml b/.github/workflows/rspec_tests.yaml
index 57dd3ff..80fe7f8 100644
--- a/.github/workflows/rspec_tests.yaml
+++ b/.github/workflows/rspec_tests.yaml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ '2.7', '3.2' ]
+        ruby: [ '3.1', '3.2', '4.0' ]
     steps:
       - name: Checkout current PR
         uses: actions/checkout@v4
@@ -25,8 +25,5 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - name: Update rubygems and install gems
-        run: |
-          gem update --system --silent --no-document
-          bundle install --jobs 4 --retry 3
+          bundler-cache: true
       - run: bundle exec rspec spec