Add fix for workflow generator to use the latest sha

Author: ryanjbaxter

.github/workflows/run-github-actions-workflow-generator.yml

@@ -8,13 +8,8 @@ on:
         required: false
         type: string
         default: ''
-      release-train-build-sha:
-        description: 'SHA to pin the release-train-build wrapper action to. Defaults to the latest commit that modified the action in this repo.'
-        required: false
-        type: string
-        default: ''
-      release-train-test-sha:
-        description: 'SHA to pin the release-train-test wrapper action to. Defaults to the latest commit that modified the action in this repo.'
+      sha:
+        description: 'SHA to pin both release-train wrapper actions to. Defaults to the latest commit in this repo.'
         required: false
         type: string
         default: ''
@@ -45,8 +40,7 @@ jobs:
       matrix: ${{ steps.build-matrix.outputs.matrix }}
       generator-version: ${{ steps.find-generator.outputs.version }}
       generator-url: ${{ steps.find-generator.outputs.url }}
-      build-sha: ${{ steps.find-shas.outputs.build-sha }}
-      test-sha: ${{ steps.find-shas.outputs.test-sha }}
+      sha: ${{ steps.find-sha.outputs.sha }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -70,33 +64,21 @@ jobs:
           echo "Generator version : ${version}"
           echo "Download URL      : ${url}"
 
-      - name: Find action SHAs
-        id: find-shas
+      - name: Find action SHA
+        id: find-sha
         env:
           GH_TOKEN: ${{ inputs.token || secrets.GH_ACTIONS_REPO_TOKEN }}
         run: |
-          if [[ -n "${{ inputs.release-train-build-sha }}" ]]; then
-            build_sha="${{ inputs.release-train-build-sha }}"
+          if [[ -n "${{ inputs.sha }}" ]]; then
+            sha="${{ inputs.sha }}"
           else
-            build_sha=$(gh api "repos/spring-cloud/spring-cloud-github-actions/commits" \
+            sha=$(gh api "repos/spring-cloud/spring-cloud-github-actions/commits" \
               -X GET \
-              -f path=".github/actions/release-train-build/action.yml" \
               -f per_page=1 \
               --jq '.[0].sha')
           fi
-          if [[ -n "${{ inputs.release-train-test-sha }}" ]]; then
-            test_sha="${{ inputs.release-train-test-sha }}"
-          else
-            test_sha=$(gh api "repos/spring-cloud/spring-cloud-github-actions/commits" \
-              -X GET \
-              -f path=".github/actions/release-train-test/action.yml" \
-              -f per_page=1 \
-              --jq '.[0].sha')
-          fi
-          echo "build-sha=${build_sha}" >> "$GITHUB_OUTPUT"
-          echo "test-sha=${test_sha}" >> "$GITHUB_OUTPUT"
-          echo "release-train-build SHA : ${build_sha}"
-          echo "release-train-test SHA  : ${test_sha}"
+          echo "sha=${sha}" >> "$GITHUB_OUTPUT"
+          echo "SHA : ${sha}"
 
       - name: Build matrix
         id: build-matrix
@@ -253,38 +235,35 @@ jobs:
       - name: Update release-train wrapper actions
         working-directory: repo
         env:
-          BUILD_SHA: ${{ needs.setup.outputs.build-sha }}
-          TEST_SHA: ${{ needs.setup.outputs.test-sha }}
+          SHA: ${{ needs.setup.outputs.sha }}
         run: |
           node - << 'JSEOF'
           const fs = require('fs');
           const path = require('path');
 
-          const buildSha = process.env.BUILD_SHA;
-          const testSha  = process.env.TEST_SHA;
+          const sha = process.env.SHA;
 
           const ACTIONS = [
             {
               file: '.github/actions/release-train-build/action.yml',
               name: 'Build Release',
               ref:  'spring-cloud/spring-cloud-github-actions/.github/actions/release-train-build',
-              sha:  buildSha,
+              sha,
             },
             {
               file: '.github/actions/release-train-test/action.yml',
               name: 'Test Release',
               ref:  'spring-cloud/spring-cloud-github-actions/.github/actions/release-train-test',
-              sha:  testSha,
+              sha,
             },
           ];
 
-          const SHA_RE = /@[0-9a-f]{40}/g;
-
           for (const { file, name, ref, sha } of ACTIONS) {
             fs.mkdirSync(path.dirname(file), { recursive: true });
             if (fs.existsSync(file)) {
               const original = fs.readFileSync(file, 'utf8');
-              const updated = original.replace(SHA_RE, `@${sha}`);
+              const shaRe = new RegExp(`(${ref.replace(/\//g, '\\/')})@[0-9a-f]{40}`, 'g');
+              const updated = original.replace(shaRe, `$1@${sha}`);
               if (updated === original) {
                 console.log(`  ${file}: SHA already up to date.`);
               } else {