From 81da35430b1af9d8f0bf276ab77753b6aef91dee Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Sun, 1 Jan 2023 03:37:51 -0700 Subject: [PATCH 1/8] fix: bug running on pull_request_review --- diff-sha.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diff-sha.sh b/diff-sha.sh index ef02928e56d..1bc80f8d6ed 100644 --- a/diff-sha.sh +++ b/diff-sha.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -euo pipefail +set -exuo pipefail INITIAL_COMMIT="false" GITHUB_OUTPUT=${GITHUB_OUTPUT:-""} From 6856cc58092517fa8634ed01fb971e5ded89c187 Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Sun, 1 Jan 2023 03:38:48 -0700 Subject: [PATCH 2/8] Update test.yml --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 34dad0f5c67..f69ea7d7301 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,9 +12,9 @@ on: - reopened branches: - main -# pull_request_review -# branches: -# - main + pull_request_review: + branches: + - main jobs: shellcheck: From 2495b27c45bfdc12188828e468cdf0d02158b75f Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Sun, 1 Jan 2023 03:48:26 -0700 Subject: [PATCH 3/8] Update action.yml --- action.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/action.yml b/action.yml index 4f3d923c484..7f358dd8af2 100644 --- a/action.yml +++ b/action.yml @@ -182,8 +182,8 @@ runs: GITHUB_REPOSITORY: ${{ github.repository }} GITHUB_REF: ${{ github.ref }} GITHUB_SHA: ${{ github.sha }} - GITHUB_BASE_REF: ${{ github.base_ref }} - GITHUB_HEAD_REF: ${{ github.head_ref }} + GITHUB_BASE_REF: ${{ github.event.base.ref }} + GITHUB_HEAD_REF: ${{ github.event.head.ref }} GITHUB_WORKSPACE: ${{ github.workspace }} GITHUB_EVENT_NUMBER: ${{ github.event.number }} GITHUB_EVENT_HEAD_REPO_FORK: ${{ github.event.pull_request.head.repo.fork }} @@ -226,7 +226,7 @@ runs: shell: bash env: GITHUB_WORKSPACE: ${{ github.workspace }} - GITHUB_BASE_REF: ${{ github.base_ref }} + GITHUB_BASE_REF: ${{ github.event.base.ref }} GITHUB_EVENT_HEAD_REPO_FORK: ${{ github.event.pull_request.head.repo.fork }} # INPUT_ is not available in Composite run steps # https://docs.github.com/en/actions/creating-actions/metadata-syntax-for-github-actions#example-specifying-inputs From e277ea7fe8906b553d97e980faf327b57505e3d1 Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Sun, 1 Jan 2023 03:50:45 -0700 Subject: [PATCH 4/8] Update diff-sha.sh --- diff-sha.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diff-sha.sh b/diff-sha.sh index 1bc80f8d6ed..ef02928e56d 100644 --- a/diff-sha.sh +++ b/diff-sha.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -exuo pipefail +set -euo pipefail INITIAL_COMMIT="false" GITHUB_OUTPUT=${GITHUB_OUTPUT:-""} From ecb429aee2d5aeae6724c019f10fc635384a656e Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Sun, 1 Jan 2023 03:55:25 -0700 Subject: [PATCH 5/8] Update action.yml --- action.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/action.yml b/action.yml index 7f358dd8af2..8d3d84ed71a 100644 --- a/action.yml +++ b/action.yml @@ -182,8 +182,8 @@ runs: GITHUB_REPOSITORY: ${{ github.repository }} GITHUB_REF: ${{ github.ref }} GITHUB_SHA: ${{ github.sha }} - GITHUB_BASE_REF: ${{ github.event.base.ref }} - GITHUB_HEAD_REF: ${{ github.event.head.ref }} + GITHUB_BASE_REF: ${{ github.event.pull_request.base.ref }} + GITHUB_HEAD_REF: ${{ github.event.pull_request.head.ref }} GITHUB_WORKSPACE: ${{ github.workspace }} GITHUB_EVENT_NUMBER: ${{ github.event.number }} GITHUB_EVENT_HEAD_REPO_FORK: ${{ github.event.pull_request.head.repo.fork }} @@ -226,7 +226,7 @@ runs: shell: bash env: GITHUB_WORKSPACE: ${{ github.workspace }} - GITHUB_BASE_REF: ${{ github.event.base.ref }} + GITHUB_BASE_REF: ${{ github.event.pull_request.base.ref }} GITHUB_EVENT_HEAD_REPO_FORK: ${{ github.event.pull_request.head.repo.fork }} # INPUT_ is not available in Composite run steps # https://docs.github.com/en/actions/creating-actions/metadata-syntax-for-github-actions#example-specifying-inputs From 576b20c8bc193d7fad8b5ad6d1fdd7f145012f0b Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Sun, 1 Jan 2023 03:59:22 -0700 Subject: [PATCH 6/8] Update diff-sha.sh --- diff-sha.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diff-sha.sh b/diff-sha.sh index ef02928e56d..1bc80f8d6ed 100644 --- a/diff-sha.sh +++ b/diff-sha.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -euo pipefail +set -exuo pipefail INITIAL_COMMIT="false" GITHUB_OUTPUT=${GITHUB_OUTPUT:-""} From 0d2efc88529b645aad78e4db714f21b144fb8232 Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Sun, 1 Jan 2023 11:36:42 -0700 Subject: [PATCH 7/8] Update diff-sha.sh --- diff-sha.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/diff-sha.sh b/diff-sha.sh index 1bc80f8d6ed..91bbca5d9bd 100644 --- a/diff-sha.sh +++ b/diff-sha.sh @@ -50,6 +50,8 @@ else echo "Valid git version found: ($GIT_VERSION)" fi +echo "Base Ref: $GITHUB_BASE_REF" + if [[ -z $GITHUB_BASE_REF ]]; then echo "Running on a push event..." TARGET_BRANCH=$GITHUB_REFNAME From 2f2d500905c14799349e3b7921fce4644c381273 Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Sun, 1 Jan 2023 11:39:29 -0700 Subject: [PATCH 8/8] Update diff-sha.sh --- diff-sha.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diff-sha.sh b/diff-sha.sh index 91bbca5d9bd..f6d337d4992 100644 --- a/diff-sha.sh +++ b/diff-sha.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -exuo pipefail +set -euo pipefail INITIAL_COMMIT="false" GITHUB_OUTPUT=${GITHUB_OUTPUT:-""}