From 81691299ec40b9a71ab00e901bbf2854301defff Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Wed, 21 Jan 2026 13:53:41 -0600 Subject: [PATCH 1/2] Fix version in comore-ds workflow * Upgrade upload-artifact, seems this was old and might becausing failures * Fix version comments --- .github/workflows/compare-ds-build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/compare-ds-build.yml b/.github/workflows/compare-ds-build.yml index 55eafa329ec..c9f9cb37fc8 100644 --- a/.github/workflows/compare-ds-build.yml +++ b/.github/workflows/compare-ds-build.yml @@ -18,12 +18,12 @@ jobs: - name: Install deps python run: pip install gitpython xmldiff - name: Checkout - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.1 with: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 - name: Checkout (CTF) - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.1 with: repository: ComplianceAsCode/content-test-filtering path: ctf @@ -61,7 +61,7 @@ jobs: tar -czvf artifacts.tar.gz artifacts - name: Upload artifacts if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }} - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v4 + uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0 with: name: pr-artifacts-${{ github.event.pull_request.head.sha }} retention-days: 1 @@ -74,7 +74,7 @@ jobs: echo "${{ github.base_ref }}" > pr-info/base-branch.txt echo "${{ steps.fork_point.outputs.FORK_POINT }}" > pr-info/fork-point.txt - name: Upload PR info - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v4 + uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0 with: name: pr-info retention-days: 1 From df742d42fcb93ae76a9a6dab74ae5ee66c740521 Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Wed, 21 Jan 2026 14:15:29 -0600 Subject: [PATCH 2/2] Add token to built products for compare-ds --- .github/workflows/compare-ds.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/compare-ds.yaml b/.github/workflows/compare-ds.yaml index 05255ae9d71..2e2de7da2e8 100644 --- a/.github/workflows/compare-ds.yaml +++ b/.github/workflows/compare-ds.yaml @@ -74,9 +74,10 @@ jobs: if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }} uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7 with: + github-token: ${{ secrets.GITHUB_TOKEN }} + run-id: ${{ github.event.workflow_run.id }} name: pr-artifacts-${{ github.event.workflow_run.head_sha }} path: pr_artifacts - run-id: ${{ github.event.workflow_run.id }} - name: Unpack built artifacts if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }} run: tar -xvzf pr_artifacts/artifacts.tar.gz -C pr_artifacts/unpacked_artifacts