Fix racy workflows

The merge_commit_sha seems to not always be calculated correctly, try to use github.event.pull_request.head.sha instead. Signed-off-by: Fredrik Lönnegren <fredrik.lonnegren@suse.com>
rancher · Mar 7, 2024 · e9a93d1 · e9a93d1
1 parent 334f4ee
commit e9a93d1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -53,7 +53,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: "${{ github.event.pull_request.merge_commit_sha }}"
+          ref: "${{ github.event.pull_request.head.sha }}"
       - run: |
           git fetch --prune --unshallow
       - name: Log in to ghcr.io

diff --git a/.github/workflows/build_and_test_x86.yaml b/.github/workflows/build_and_test_x86.yaml
@@ -24,7 +24,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: "${{ github.event.pull_request.merge_commit_sha }}"
+          ref: "${{ github.event.pull_request.head.sha }}"
       - run: |
           git fetch --prune --unshallow
       - name: Log in to registry
@@ -53,7 +53,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: "${{ github.event.pull_request.merge_commit_sha }}"
+          ref: "${{ github.event.pull_request.head.sha }}"
       - run: |
           git fetch --prune --unshallow
       - name: Cached ISO
@@ -95,7 +95,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: "${{ github.event.pull_request.merge_commit_sha }}"
+          ref: "${{ github.event.pull_request.head.sha }}"
       - run: |
           git fetch --prune --unshallow
       - name: Checks cached Disk
@@ -150,7 +150,7 @@ jobs:
           fi
       - uses: actions/checkout@v4
         with:
-          ref: "${{ github.event.pull_request.merge_commit_sha }}"
+          ref: "${{ github.event.pull_request.head.sha }}"
       - id: image
         env:
           FLAVOR: ${{ inputs.flavor }}
@@ -179,7 +179,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: "${{ github.event.pull_request.merge_commit_sha }}"
+          ref: "${{ github.event.pull_request.head.sha }}"
       - name: Install Go
         uses: actions/setup-go@v5
         with:
@@ -243,7 +243,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: "${{ github.event.pull_request.merge_commit_sha }}"
+          ref: "${{ github.event.pull_request.head.sha }}"
       - name: Install Go
         uses: actions/setup-go@v5
         with: