From 44410fa7df68007bfff91ccd8fdde77dba539a2f Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Mon, 4 May 2026 15:39:59 -0700 Subject: [PATCH 1/2] (maint) Update Checkout from v4 to v6 The Checkout v4 action is based on Node.js 20, and is deprecated. This commit updates GitHub Actions workflows to use Checkout v6. --- .github/actions/workflow-restarter-proxy/action.yml | 2 +- .github/workflows/gem_acceptance.yml | 2 +- .github/workflows/gem_ci.yml | 2 +- .github/workflows/gem_release.yml | 2 +- .github/workflows/gem_release_prep.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/mend_ruby.yml | 2 +- .github/workflows/module_acceptance.yml | 4 ++-- .github/workflows/module_ci.yml | 4 ++-- .github/workflows/module_release.yml | 2 +- .github/workflows/module_release_prep.yml | 3 +-- .github/workflows/tooling_mend_ruby.yml | 2 +- .github/workflows/workflow-restarter-test.yml | 2 +- .github/workflows/workflow-restarter.yml | 2 +- 14 files changed, 16 insertions(+), 17 deletions(-) diff --git a/.github/actions/workflow-restarter-proxy/action.yml b/.github/actions/workflow-restarter-proxy/action.yml index 4fc6acf..db67c61 100644 --- a/.github/actions/workflow-restarter-proxy/action.yml +++ b/.github/actions/workflow-restarter-proxy/action.yml @@ -26,7 +26,7 @@ runs: # checkout the repository because I want bundler to have access to my Gemfile - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 # setup ruby including a bundle install of my Gemfile - name: Set up Ruby and install Octokit diff --git a/.github/workflows/gem_acceptance.yml b/.github/workflows/gem_acceptance.yml index ab915fb..5ea8275 100644 --- a/.github/workflows/gem_acceptance.yml +++ b/.github/workflows/gem_acceptance.yml @@ -36,7 +36,7 @@ jobs: steps: - name: "checkout" - uses: "actions/checkout@v4" + uses: "actions/checkout@v6" - name: "export environment" run: | diff --git a/.github/workflows/gem_ci.yml b/.github/workflows/gem_ci.yml index 8827168..e42fa9d 100644 --- a/.github/workflows/gem_ci.yml +++ b/.github/workflows/gem_ci.yml @@ -46,7 +46,7 @@ jobs: steps: - name: "checkout" - uses: "actions/checkout@v4" + uses: "actions/checkout@v6" with: fetch-depth: 1 - name: "shellcheck" diff --git a/.github/workflows/gem_release.yml b/.github/workflows/gem_release.yml index 3204244..19c7bb3 100644 --- a/.github/workflows/gem_release.yml +++ b/.github/workflows/gem_release.yml @@ -21,7 +21,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v4" + uses: "actions/checkout@v6" with: ref: ${{ github.event.inputs.target }} clean: true diff --git a/.github/workflows/gem_release_prep.yml b/.github/workflows/gem_release_prep.yml index 4cdfbc1..03febe2 100644 --- a/.github/workflows/gem_release_prep.yml +++ b/.github/workflows/gem_release_prep.yml @@ -25,7 +25,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v4" + uses: "actions/checkout@v6" with: ref: ${{ github.event.inputs.target }} clean: true diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index c350534..785a1ef 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,7 +14,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v4" + uses: "actions/checkout@v6" - name: "Run yaml-lint" uses: "ibiqlik/action-yamllint@v3" diff --git a/.github/workflows/mend_ruby.yml b/.github/workflows/mend_ruby.yml index 3217ab4..91a79e9 100644 --- a/.github/workflows/mend_ruby.yml +++ b/.github/workflows/mend_ruby.yml @@ -40,7 +40,7 @@ jobs: - name: "checkout" if: success() - uses: "actions/checkout@v4" + uses: "actions/checkout@v6" with: fetch-depth: 1 diff --git a/.github/workflows/module_acceptance.yml b/.github/workflows/module_acceptance.yml index 66417ba..9354bdc 100644 --- a/.github/workflows/module_acceptance.yml +++ b/.github/workflows/module_acceptance.yml @@ -45,7 +45,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v4" + uses: "actions/checkout@v6" - name: "Configure forge authentication" env: @@ -124,7 +124,7 @@ jobs: nslookup artifactory.delivery.puppetlabs.net - name: "Checkout" - uses: "actions/checkout@v4" + uses: "actions/checkout@v6" - name: "Disable Apparmor" if: ${{ inputs.disable_apparmor }} diff --git a/.github/workflows/module_ci.yml b/.github/workflows/module_ci.yml index eeb2572..99b7985 100644 --- a/.github/workflows/module_ci.yml +++ b/.github/workflows/module_ci.yml @@ -43,7 +43,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v4" + uses: "actions/checkout@v6" with: ref: ${{ github.event.pull_request.head.sha }} @@ -92,7 +92,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v4" + uses: "actions/checkout@v6" with: ref: ${{ github.event.pull_request.head.sha }} diff --git a/.github/workflows/module_release.yml b/.github/workflows/module_release.yml index 5482e5e..7dba5af 100644 --- a/.github/workflows/module_release.yml +++ b/.github/workflows/module_release.yml @@ -20,7 +20,7 @@ jobs: ruby-version: "3.1" - name: "Checkout" - uses: "actions/checkout@v4" + uses: "actions/checkout@v6" with: ref: "${{ github.ref }}" clean: true diff --git a/.github/workflows/module_release_prep.yml b/.github/workflows/module_release_prep.yml index 3b3080d..f0b709c 100644 --- a/.github/workflows/module_release_prep.yml +++ b/.github/workflows/module_release_prep.yml @@ -12,7 +12,6 @@ on: required: true type: "string" - jobs: release_prep: name: "Release prep" @@ -24,7 +23,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v4" + uses: "actions/checkout@v6" with: fetch-depth: 0 diff --git a/.github/workflows/tooling_mend_ruby.yml b/.github/workflows/tooling_mend_ruby.yml index 911ad9c..ca11407 100644 --- a/.github/workflows/tooling_mend_ruby.yml +++ b/.github/workflows/tooling_mend_ruby.yml @@ -50,7 +50,7 @@ jobs: - name: "checkout" if: success() - uses: "actions/checkout@v4" + uses: "actions/checkout@v6" with: fetch-depth: 1 diff --git a/.github/workflows/workflow-restarter-test.yml b/.github/workflows/workflow-restarter-test.yml index 090a557..118ae07 100644 --- a/.github/workflows/workflow-restarter-test.yml +++ b/.github/workflows/workflow-restarter-test.yml @@ -48,7 +48,7 @@ jobs: steps: # (3) checkout this repository in order to "see" the following custom action - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Trigger reusable workflow uses: "puppetlabs/cat-github-actions/.github/actions/workflow-restarter-proxy@main" diff --git a/.github/workflows/workflow-restarter.yml b/.github/workflows/workflow-restarter.yml index f2e88b4..65354cd 100644 --- a/.github/workflows/workflow-restarter.yml +++ b/.github/workflows/workflow-restarter.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Check retry count id: check-retry From b29e64263b71f868eb29c52d824acba0a074cfa0 Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Tue, 5 May 2026 09:42:24 -0700 Subject: [PATCH 2/2] (maint) Update Ruby version, remove Bundler pin Ruby 3.1 and 3.2 are end-of-life. This commit updates the version of Ruby in the module release prep workflow from 3.1 to 3.3. Also, it removes the pin for Bundler at 2.4.22, as that was done for testing purposes and Ruby 3.3 uses the Bundler 2.5 series. --- .github/workflows/module_release_prep.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/module_release_prep.yml b/.github/workflows/module_release_prep.yml index f0b709c..4b1208e 100644 --- a/.github/workflows/module_release_prep.yml +++ b/.github/workflows/module_release_prep.yml @@ -44,9 +44,8 @@ jobs: - name: "setup ruby" uses: "ruby/setup-ruby@v1" with: - ruby-version: "3.1" + ruby-version: "3.3" bundler-cache: "true" - bundler: 2.4.22 - name: "bundle environment" run: |