Target should be current merge

This commit is contained in:
Mustafa Gezen 2022-11-01 04:18:29 +01:00
parent 257644f533
commit e9f7e34810
Signed by untrusted user who does not match committer: mustafa
GPG Key ID: DCDF010D946438C1

View File

@ -9,8 +9,6 @@ workspace_dir="$(pwd)"
$BAZEL_B //:bazel-diff
set -x
# Generate starting hashes
echo "Base hash is $PULL_BASE_SHA"
git checkout "$PULL_BASE_SHA" --quiet
@ -19,9 +17,9 @@ bazel-bin/bazel-diff generate-hashes -w "$workspace_dir" -b "$bazel_bin" startin
# Generate ending hashes
TARGET_HASH="$PULL_PULL_SHA"
if [[ -z "$TARGET_HASH" ]]; then
TARGET_HASH="$(git log "HEAD@{1}" --pretty=format:"%H" --merges -n 1)"
TARGET_HASH="$(git log --pretty=format:"%H" --merges -n 1)"
fi
echo "Target hash is $PULL_PULL_SHA"
echo "Target hash is $TARGET_HASH"
git checkout "$TARGET_HASH" --quiet
bazel-bin/bazel-diff generate-hashes -w "$workspace_dir" -b "$bazel_bin" ending_hashes_json