Merge pull request #2009 from holly-cummins/actions-tidying

Actions updates: Update download action, and do not claim to have torn down things that were not torn down
quarkusio · Jun 12, 2024 · 982c1fc · 982c1fc
2 parents ff4c55c + 3b364d6
commit 982c1fc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/preview-teardown.yml b/.github/workflows/preview-teardown.yml
@@ -10,9 +10,10 @@ jobs:
     steps:
       - name: Teardown surge preview
         id: deploy
-        run: npx surge teardown https://quarkus-site-pr-${{ github.event.number }}-preview.surge.sh --token ${{ secrets.SURGE_TOKEN }}
+        run: npx surge teardown https://quarkus-site-pr-${{ github.event.number }}-preview.surge.sh --token ${{ secrets.SURGE_TOKEN }} || echo "NOT_TORNDOWN=true" >> "$GITHUB_ENV"
       - name: Update PR status comment
         uses: actions-cool/[email protected]
+        if: env.NOT_TORNDOWN != 'true'
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           body: |

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
@@ -12,9 +12,10 @@ jobs:
     if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
     steps:
     - name: Download PR Artifact
-      uses: dawidd6/action-download-artifact@v2
+      uses: dawidd6/action-download-artifact@v5
       with:
         workflow: ${{ github.event.workflow_run.workflow_id }}
+        run_id: ${{ github.event.workflow_run.id }}
         workflow_conclusion: success
         name: site
     - name: Store PR id as variable