Merge pull request #1390 from puppetlabs/cat_1820

Use reusable workflow restarter

.github/workflows/ci.yml

@@ -13,7 +13,6 @@ env:
   CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
 jobs:
-
   spec:
     strategy:
       fail-fast: false
@@ -28,7 +27,7 @@ jobs:
             ruby_version: "3.2"
     name: "spec (ruby ${{ matrix.ruby_version }})"
     uses: "puppetlabs/cat-github-actions/.github/workflows/gem_ci.yml@main"
-    secrets: "inherit"
+    secrets: inherit
     with:
       rake_task: 'spec:coverage'
       ruby_version: ${{ matrix.ruby_version }}
@@ -52,7 +51,7 @@ jobs:
             ruby_version: "3.2"
     name: "acceptance (ruby ${{ matrix.ruby_version }} | ${{ matrix.os }})"
     uses: "puppetlabs/cat-github-actions/.github/workflows/gem_acceptance.yml@main"
-    secrets: "inherit"
+    secrets: inherit
     with:
       ruby_version: ${{ matrix.ruby_version }}
       puppet_version: ${{ matrix.puppet_gem_version }}

.github/workflows/nightly.yml

@@ -68,7 +68,7 @@ jobs:
       # this to trigger the reusable workflow that restarts the failed job; and
       # (b) custom actions do not have access to the calling workflow's secrets
       - name: Trigger reusable workflow
-        uses: ./.github/actions/workflow-restarter-proxy
+        uses: "puppetlabs/cat-github-actions/.github/actions/workflow-restarter-proxy@main"
         env:
           SOURCE_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.github/workflows/workflow-restarter-test.yml

@@ -10,6 +10,8 @@ on:
           'false' = (succeed, fail)  
         required: true
         default: 'true'
+env:
+  SOURCE_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
   unit:
@@ -53,7 +55,7 @@ jobs:
       # this to trigger the reusable workflow that restarts the failed job; and
       # (b) custom actions do not have access to the calling workflow's secrets
       - name: Trigger reusable workflow
-        uses: ./.github/actions/workflow-restarter-proxy
+        uses: "puppetlabs/cat-github-actions/.github/actions/workflow-restarter-proxy@main"
         env:
           SOURCE_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.github/workflows/workflow-restarter.yml

@@ -1,4 +1,4 @@
----
+# target-repo/.github/workflows/call-reusable-workflow.yml
 name: Workflow Restarter
 on:
   workflow_dispatch:
@@ -14,38 +14,13 @@ on:
       retries:
         description: "The number of times to retry the workflow run."
         required: false
-        type: number
-        default: 3
-    secrets:
-      GITHUB_TOKEN:
-        required: true
+        type: string
+        default: "3"
 
 jobs:
-  rerun:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Check retry count
-        id: check-retry
-        run: |
-          # IF `--attempts` returns a non-zero exit code, then keep retrying
-          status_code=$(gh run view ${{ inputs.run_id }} --repo ${{ inputs.repo }} --attempt ${{ inputs.retries }} --json status) || { 
-              echo "Retry count is within limit"
-              echo "::set-output name=should_retry::true"
-              exit 0
-          }
-
-          # ELSE `--attempts` returns a zero exit code, so stop retrying
-          echo "Retry count has reached the limit"
-          echo "::set-output name=should_retry::false"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Re-run failed jobs
-        if: ${{ steps.check-retry.outputs.should_retry == 'true' }}
-        run: gh run rerun --failed ${{ inputs.run_id }} --repo ${{ inputs.repo }}
-        continue-on-error: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
+  call-reusable-workflow:
+    uses: "puppetlabs/cat-github-actions/.github/workflows/workflow-restarter.yml@main"
+    with:
+      repo: ${{ inputs.repo }}
+      run_id: ${{ inputs.run_id }}
+      retries: ${{ inputs.retries }}