diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d3671341..fedd5d55 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -127,9 +127,9 @@ jobs: until: "2022-08-20" - name: Check output - if: "!contains(steps.changed-files-until.outputs.all_changed_files, 'entrypoint.sh')" + if: "!contains(steps.changed-files-until.outputs.all_changed_files, 'README.md')" run: | - echo "Invalid output: Expected to include (entrypoint.sh) got (${{ steps.changed-files-until.outputs.all_changed_files }})" + echo "Invalid output: Expected to include (README.md) got (${{ steps.changed-files-until.outputs.all_changed_files }})" exit 1 shell: bash diff --git a/diff-sha.sh b/diff-sha.sh index 443d3b59..3029cdda 100644 --- a/diff-sha.sh +++ b/diff-sha.sh @@ -45,8 +45,6 @@ fi if [[ -z $GITHUB_BASE_REF ]]; then echo "Running on a push event..." - TARGET_BRANCH=${GITHUB_REF/refs\/heads\//} && exit_status=$? || exit_status=$? - CURRENT_BRANCH=$TARGET_BRANCH && exit_status=$? || exit_status=$? echo "::debug::Getting HEAD SHA..." if [[ -n "$INPUT_UNTIL" ]]; then @@ -67,6 +65,9 @@ if [[ -z $GITHUB_BASE_REF ]]; then fi fi + TARGET_BRANCH=$(git name-rev --name-only "$CURRENT_SHA" 2>&1) && exit_status=$? || exit_status=$? + CURRENT_BRANCH=$TARGET_BRANCH && exit_status=$? || exit_status=$? + echo "::debug::Verifying the current commit SHA: $CURRENT_SHA" git rev-parse --quiet --verify "$CURRENT_SHA^{commit}" 1>/dev/null 2>&1 && exit_status=$? || exit_status=$? @@ -127,8 +128,6 @@ if [[ -z $GITHUB_BASE_REF ]]; then # shellcheck disable=SC2086 git fetch $EXTRA_ARGS -u --progress --deepen="$INPUT_FETCH_DEPTH" PREVIOUS_SHA=$INPUT_BASE_SHA - TARGET_BRANCH=$(git name-rev --name-only "$PREVIOUS_SHA" 2>&1) && exit_status=$? || exit_status=$? - CURRENT_BRANCH=$TARGET_BRANCH fi echo "::debug::Target branch $TARGET_BRANCH..."