From 240cdf7814c54ab38cade8e0e8ab9e15c0f7be4a Mon Sep 17 00:00:00 2001 From: Achilleas Koutsou Date: Fri, 29 Aug 2025 14:44:02 +0200 Subject: [PATCH] github: fix the validate checksums action on the merge queue When running on the merge queue, we can't run the step that checks ever commit in the PR, because there is no PR. We should only check the HEAD. Add an extra step for the merge queue and run each of the check steps based on the event type. --- .github/workflows/validate-checksums.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/validate-checksums.yml b/.github/workflows/validate-checksums.yml index 3d5e3f7514..2090d00154 100644 --- a/.github/workflows/validate-checksums.yml +++ b/.github/workflows/validate-checksums.yml @@ -43,6 +43,7 @@ jobs: # Run the manifest checksum generator on each commit on the branch. # If it changes, it will interrupt the rebase and exit with non-zero. - name: Validate manifest checksums for every commit in the PR + if: ${{ github.event_name == 'pull_request' }} env: # commit ID of target branch base_sha: ${{ github.event.pull_request.base.sha }} @@ -60,3 +61,11 @@ jobs: echo "-----------------------------------------------------------------------------" exit 1 fi + + # Run the manifest checksum generator on the HEAD (merge group temporary + # branch) and fail if there are changes. + - name: Validate manifest checksums (merge queue) + if: ${{ github.event_name == 'merge_group' }} + run: | + ./tools/gen-manifest-checksums.sh + git diff --exit-code