mirror of
https://github.com/rocky-linux/peridot.git
synced 2024-12-20 01:38:29 +00:00
Target should be current merge
This commit is contained in:
parent
257644f533
commit
e9f7e34810
@ -9,8 +9,6 @@ workspace_dir="$(pwd)"
|
|||||||
|
|
||||||
$BAZEL_B //:bazel-diff
|
$BAZEL_B //:bazel-diff
|
||||||
|
|
||||||
set -x
|
|
||||||
|
|
||||||
# Generate starting hashes
|
# Generate starting hashes
|
||||||
echo "Base hash is $PULL_BASE_SHA"
|
echo "Base hash is $PULL_BASE_SHA"
|
||||||
git checkout "$PULL_BASE_SHA" --quiet
|
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
|
# Generate ending hashes
|
||||||
TARGET_HASH="$PULL_PULL_SHA"
|
TARGET_HASH="$PULL_PULL_SHA"
|
||||||
if [[ -z "$TARGET_HASH" ]]; then
|
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
|
fi
|
||||||
echo "Target hash is $PULL_PULL_SHA"
|
echo "Target hash is $TARGET_HASH"
|
||||||
git checkout "$TARGET_HASH" --quiet
|
git checkout "$TARGET_HASH" --quiet
|
||||||
bazel-bin/bazel-diff generate-hashes -w "$workspace_dir" -b "$bazel_bin" ending_hashes_json
|
bazel-bin/bazel-diff generate-hashes -w "$workspace_dir" -b "$bazel_bin" ending_hashes_json
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user