From 71b6fbedb88f2a1c50e0df3bad37c92ca8b922c9 Mon Sep 17 00:00:00 2001 From: laurentsimon Date: Thu, 29 Sep 2022 23:28:04 +0000 Subject: [PATCH 1/2] update --- .github/actions/verify-checkout/action.yaml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/actions/verify-checkout/action.yaml b/.github/actions/verify-checkout/action.yaml index fe98bb311c..b2aa0a7518 100644 --- a/.github/actions/verify-checkout/action.yaml +++ b/.github/actions/verify-checkout/action.yaml @@ -7,13 +7,20 @@ runs: - name: Verify commit sha shell: bash env: - CONTEXT: "${{ toJSON(github) }}" + GITHUB_CONTEXT: "${{ toJSON(github) }}" + PULL_REQUEST_SHA: "${{ github.event.pull_request.head.sha }}" run: | set -euo pipefail - git_sha=$(git log -1 --format='%H') - if [[ "$git_sha" != "$GITHUB_SHA" ]]; then - echo "mismatch git sha \"$git_sha\" != \"$GITHUB_SHA\"" + git_sha="$(git log -1 --format='%H')" + github_sha="$GITHUB_SHA" + + if [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then + github_sha="$PULL_REQUEST_SHA" + fi + + if [[ "$git_sha" != "$github_sha" ]]; then + echo "mismatch git sha \"$git_sha\" != \"$github_sha\"" echo "GitHub context:" echo "$CONTEXT" echo From bf86382f5112060b4330aa02a89c78b6f7b32c9f Mon Sep 17 00:00:00 2001 From: laurentsimon Date: Thu, 29 Sep 2022 23:29:52 +0000 Subject: [PATCH 2/2] update --- .github/actions/verify-checkout/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/verify-checkout/action.yaml b/.github/actions/verify-checkout/action.yaml index b2aa0a7518..82e8fe33de 100644 --- a/.github/actions/verify-checkout/action.yaml +++ b/.github/actions/verify-checkout/action.yaml @@ -7,7 +7,7 @@ runs: - name: Verify commit sha shell: bash env: - GITHUB_CONTEXT: "${{ toJSON(github) }}" + CONTEXT: "${{ toJSON(github) }}" PULL_REQUEST_SHA: "${{ github.event.pull_request.head.sha }}" run: | set -euo pipefail