mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(nix/buildkite): Drop --fork-point parameter

Browse source 
The --fork-point parameter is dependent on reflog data which may get
garbage collected. This can lead to flaky behaviour where it returns
no results and fails if `git gc` recently ran (Buildkite will do this
occasionally).

Though the parameter is semantically closer to what we're looking for,
the output is *usually* the same commit since we're not dealing with
more than one thing to compare.

Change-Id: Idc31e7a26fda2b7113edfa162d9d3811b1a01bf6
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5032
Tested-by: BuildkiteCI
Autosubmit: tazjin <tazjin@tvl.su>
Reviewed-by: sterni <sternenseemann@systemli.org>
This commit is contained in:
Vincent Ambo 2022-01-20 21:11:59 +03:00 committed by clbot
parent ac7e989571
commit 16d72933fc
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nix/buildkite/fetch-parent-targets.sh
View file

@ -17,7 +17,7 @@ set -ueo pipefail
git fetch -v origin "${BUILDKITE_PIPELINE_DEFAULT_BRANCH}" git fetch -v origin "${BUILDKITE_PIPELINE_DEFAULT_BRANCH}"
FIRST=$(git merge-base --fork-point FETCH_HEAD "${BUILDKITE_COMMIT}") FIRST=$(git merge-base FETCH_HEAD "${BUILDKITE_COMMIT}")
SECOND=$(git rev-parse "$FIRST~1") SECOND=$(git rev-parse "$FIRST~1")
THIRD=$(git rev-parse "$FIRST~2") THIRD=$(git rev-parse "$FIRST~2")