updated get-base-sha.sh

tj-actions · Sep 25, 2022 · b50afac · b50afac
1 parent 7de6088
commit b50afac
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/action.yml b/action.yml
@@ -158,6 +158,7 @@ runs:
       env:
         GITHUB_WORKSPACE: ${{ github.workspace }}
         GITHUB_EVENT_BEFORE: ${{ github.event.before }}
+        GITHUB_EVENT_FORCED : ${{ github.event.forced }}
         # INPUT_<VARIABLE_NAME> is not available in Composite run steps
         # https://docs.github.com/en/actions/creating-actions/metadata-syntax-for-github-actions#example-specifying-inputs
         INPUT_SINCE: ${{ inputs.since }}

diff --git a/get-base-sha.sh b/get-base-sha.sh
@@ -22,10 +22,13 @@ if [[ -n "$INPUT_SINCE" ]]; then
 elif [[ -n "$INPUT_BASE_SHA" ]]; then
   echo "::set-output name=base_sha::$INPUT_BASE_SHA"
 elif [[ "$INPUT_SINCE_LAST_REMOTE_COMMIT" == "true" ]]; then
-  LAST_REMOTE_COMMIT="$GITHUB_EVENT_BEFORE"
+  LAST_REMOTE_COMMIT=""
+
+  if [[ "$GITHUB_EVENT_FORCED" == "false" ]]; then
+    LAST_REMOTE_COMMIT=$GITHUB_EVENT_BEFORE
+  fi
 
   if [[ -z "$LAST_REMOTE_COMMIT" || "$LAST_REMOTE_COMMIT" == "0000000000000000000000000000000000000000" ]]; then
-    echo "::debug::First commit detected"
     LAST_REMOTE_COMMIT=$(git rev-parse "$(git branch -r --sort=-committerdate | head -1 | xargs)")
   fi
   if [[ "$INPUT_SHA" == "$LAST_REMOTE_COMMIT" ]]; then