]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
.github/workflows/releng-audit.yaml: Check main for upstream commit 69681/head
authorDavid Galloway <david.galloway@ibm.com>
Tue, 23 Jun 2026 14:11:34 +0000 (10:11 -0400)
committerDavid Galloway <david.galloway@ibm.com>
Tue, 23 Jun 2026 14:11:34 +0000 (10:11 -0400)
This check was failing to correctly identify whether backported commits
had actually been cherry-picked because it was checking the target branch
instead of the main branch.  This change checks out the main branch
to look for the upstream cherry-picked commit.

Signed-off-by: David Galloway <david.galloway@ibm.com>
.github/workflows/releng-audit.yaml

index 4a4ab0149868c4bd6a708aefe062954655fe9508..a574d7e076d3edf370f0578260edc69588c52fbb 100644 (file)
@@ -258,7 +258,14 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: 0
-          
+
+      - name: Fetch main for parity check
+        if: steps.router.outputs.run_audit == 'true'
+        # checkout only fetches the PR's base branch (e.g. squid/tentacle/umbrella).
+        # The parity check needs the main ref to walk the commit history graph and find the upstream
+        # merge commit for each cherry-pick, so fetch it explicitly as origin/main.
+        run: git fetch --no-tags origin +refs/heads/main:refs/remotes/origin/main
+
       - name: Setup Python
         if: steps.router.outputs.run_audit == 'true'
         uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0