From ff40ae70fa42945c7a19df4e1810dfca17793988 Mon Sep 17 00:00:00 2001
From: Gavin Didrichsen <gavin.didrichsen@gmail.com>
Date: Wed, 13 May 2026 17:12:09 +0100
Subject: [PATCH 1/2] (maint) Bump ruby_task_helper upper bound to < 2.0.0

ruby_task_helper is now at 1.0.1, which violates the existing < 1.0.0
upper bound and breaks Bolt module dependency resolution (BOLT-136).

Bump the upper bound to < 2.0.0 to unblock 1.x while guarding against
a hypothetical breaking 2.x release.
---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 27e0db6..aaf3fc1 100644
--- a/metadata.json
+++ b/metadata.json
@@ -13,7 +13,7 @@
     },
     {
       "name":"puppetlabs-ruby_task_helper",
-      "version_requirement":">= 0.4.0 < 1.0.0"
+      "version_requirement":">= 0.4.0 < 2.0.0"
     }
   ],
   "operatingsystem_support": [

From d6668bdc27ce6210e78154b863febb0472597ca0 Mon Sep 17 00:00:00 2001
From: Gavin Didrichsen <gavin.didrichsen@gmail.com>
Date: Wed, 13 May 2026 17:12:09 +0100
Subject: [PATCH 2/2] (maint) Modernize CI: Ruby 3.1, actions/v4, fix workflow
 triggers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Upgrade actions/checkout and actions/setup-ruby to v4
- Use ruby/setup-ruby with bundler-cache (replaces manual gem caching)
- Bump Ruby from 2.5 to 3.1
- Fix push trigger branch: master → main
- Fix pull_request trigger key: type → types
---
 .github/workflows/tests.yaml | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index f8de2bd..ba96aea 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -2,10 +2,10 @@ name: Tests
 
 on:
   push:
-    branches: [master]
+    branches: [main]
     paths-ignore: ['*.md']
   pull_request:
-    type: [opened, reopened, edited]
+    types: [opened, reopened, edited]
     paths-ignore: ['*.md']
 
 jobs:
@@ -15,24 +15,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
       - name: Setup Ruby
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.5.x'
-      - name: Install bundler
-        run: |
-          gem install bundler
-          bundle config path vendor/bundle
-      - name: Cache gems
-        id: cache
-        uses: actions/cache@v1
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile') }}
-      - name: Install gems
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: bundle install --jobs 4 --retry 3
+          ruby-version: '3.1'
+          bundler-cache: true
       - name: Clone helpers
         run: |
           git clone https://github.com/puppetlabs/puppetlabs-ruby_task_helper ../ruby_task_helper
@@ -45,11 +33,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
       - name: Setup Ruby
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.5.x'
+          ruby-version: '3.1'
       - name: Install rubocop
         run: gem install rubocop
       - name: Run rubocop