diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 59033f9f..50266cdb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -211,13 +211,12 @@ jobs: max-parallel: 4 matrix: platform: [ubuntu-latest, ubuntu-22.04, windows-latest, macos-latest, macos-11, ubuntu-18.04, windows-2022] - fetch-depth: [1, 2] steps: - name: Checkout to branch uses: actions/checkout@v3 with: - fetch-depth: ${{ matrix.fetch-depth }} + fetch-depth: 2 - name: Run changed-files id: changed-files diff --git a/diff-sha.sh b/diff-sha.sh index 95807a14..d7e396aa 100644 --- a/diff-sha.sh +++ b/diff-sha.sh @@ -83,7 +83,7 @@ if [[ -z $GITHUB_BASE_REF ]]; then fi else git fetch --no-tags -u --progress --depth="$INPUT_FETCH_DEPTH" origin "$TARGET_BRANCH":"$TARGET_BRANCH" - + PREVIOUS_SHA=$(git rev-list --no-merges -n 1 "$TARGET_BRANCH" 2>&1) && exit_status=$? || exit_status=$? if [[ -z "$PREVIOUS_SHA" ]]; then @@ -135,6 +135,7 @@ else if [[ -z $INPUT_BASE_SHA ]]; then git fetch --no-tags -u --progress --depth="$INPUT_FETCH_DEPTH" origin "$TARGET_BRANCH":"$TARGET_BRANCH" + git fetch --no-tags -u --progress origin "$CURRENT_BRANCH":"$CURRENT_BRANCH" PREVIOUS_SHA=$(git rev-list --no-merges -n 1 "$TARGET_BRANCH" 2>&1) && exit_status=$? || exit_status=$? if [[ -z "$PREVIOUS_SHA" ]]; then @@ -143,6 +144,7 @@ else echo "::debug::Previous SHA: $PREVIOUS_SHA" else git fetch --no-tags -u --progress --depth="$INPUT_FETCH_DEPTH" origin "$INPUT_BASE_SHA" && exit_status=$? || exit_status=$? + git fetch --no-tags -u --progress origin "$CURRENT_BRANCH":"$CURRENT_BRANCH" PREVIOUS_SHA=$INPUT_BASE_SHA && exit_status=$? || exit_status=$? fi