Merge pull request #130521 from carlocab/gh-try-download

workflows: use `gh-try-download` action
Homebrew · May 9, 2023 · 8f0a4f9 · 8f0a4f9
2 parents 2a6feef + b37077f
commit 8f0a4f9
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -32,22 +32,22 @@ jobs:
       approved: ${{ steps.approval-status.outputs.approved }}
       complete: ${{ steps.approval-status.outputs.complete }}
       mergeable: ${{ steps.approval-status.outputs.mergeable }}
-    env:
-      WORKFLOW_ID: ${{ github.event.workflow_run.id }}
     permissions:
       contents: read
       pull-requests: read
       actions: read
     steps:
       - name: Download `pull-number` artifact
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: gh run download --name pull-number "$WORKFLOW_ID"
+        uses: Homebrew/actions/gh-try-download@master
+        with:
+          artifact-name: pull-number
+          workflow-id: ${{ github.event.workflow_run.id }}
 
       - name: Dump debug info in case of failure
         if: failure()
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          WORKFLOW_ID: ${{ github.event.workflow_run.id }}
         run: |
           printf '```\n' >> "$GITHUB_STEP_SUMMARY"
           gh run view "$WORKFLOW_ID" | tee -a "$GITHUB_STEP_SUMMARY"
@@ -57,6 +57,10 @@ jobs:
           gh api "repos/{owner}/{repo}/actions/runs/$WORKFLOW_ID" | jq . | tee -a "$GITHUB_STEP_SUMMARY"
           printf '```\n' >> "$GITHUB_STEP_SUMMARY"
 
+          printf '```\n' >> "$GITHUB_STEP_SUMMARY"
+          gh api "repos/{owner}/{repo}/actions/runs/$WORKFLOW_ID/artifacts" | jq . | tee -a "$GITHUB_STEP_SUMMARY"
+          printf '```\n' >> "$GITHUB_STEP_SUMMARY"
+
       - run: echo "number=$(cat number)" >> "$GITHUB_OUTPUT"
         id: pr
 

diff --git a/.github/workflows/recreate-linux-runners.yml b/.github/workflows/recreate-linux-runners.yml
@@ -35,17 +35,22 @@ jobs:
       actions: read # for `gh run download`
       pull-requests: read # for `gh api`
     steps:
+      - name: Download `pull-number` artifact
+        if: github.event_name == 'workflow_run'
+        uses: Homebrew/actions/gh-try-download@master
+        with:
+          artifact-name: pull-number
+          workflow-id: ${{ github.event.workflow_run.id }}
+
       - name: Check if runner needs to be recreated
         id: check
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          WORKFLOW_ID: ${{ github.event.workflow_run.id }}
         run: |
           recreate=true
 
           if [[ "$GITHUB_EVENT_NAME" = "workflow_run" ]]
           then
-            gh run download --name pull-number "$WORKFLOW_ID"
             PR="$(cat number)"
 
             recreate="$(

diff --git a/.github/workflows/remove-long-timeout-labels.yml b/.github/workflows/remove-long-timeout-labels.yml
@@ -31,10 +31,10 @@ jobs:
       pull-requests: read # for `gh api`
     steps:
       - name: Download `pull-number` artifact
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          WORKFLOW_ID: ${{ github.event.workflow_run.id }}
-        run: gh run download --name pull-number "$WORKFLOW_ID"
+        uses: Homebrew/actions/gh-try-download@master
+        with:
+          artifact-name: pull-number
+          workflow-id: ${{ github.event.workflow_run.id }}
 
       - run: echo "number=$(cat number)" >> "$GITHUB_OUTPUT"
         id: pr