OK

hasura · Nov 1, 2023 · 9ef7090 · 9ef7090
1 parent 6bf29b5
commit 9ef7090
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/.github/workflows/e2e-test.yaml b/.github/workflows/e2e-test.yaml
@@ -13,8 +13,14 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      # pull requests create a new merge commit so we have to work our way back
+      # to the actual commit so it matches the Docker image
       - name: Generate short SHA
-        run: echo "hash=$(git rev-parse --short=9 "$GITHUB_SHA")" >> $GITHUB_OUTPUT
+        run: |
+          if [ "$GITHUB_EVENT_NAME" == "pull_request" ]; then
+            GITHUB_SHA=$(cat $GITHUB_EVENT_PATH | jq -r .pull_request.head.sha)
+          fi
+          echo "hash=$(git rev-parse --short=9 "$GITHUB_SHA")" >> $GITHUB_OUTPUT
         id: short-git-hash
 
       - name: Wait for Docker image to be created