diff options
| author | Ed Santiago <santiago@redhat.com> | 2022-05-11 17:11:53 -0600 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2022-06-14 13:16:35 -0400 |
| commit | c004978ea895e5b9a4f67388caba11fa893f586c (patch) | |
| tree | 0564c759101b993dbc834d4938978da585ac4a1c | |
| parent | 2ac61ebfee01bd2c3d1b9d1ecf5dbd4e390eb9c9 (diff) | |
| download | podman-c004978ea895e5b9a4f67388caba11fa893f586c.tar.gz podman-c004978ea895e5b9a4f67388caba11fa893f586c.tar.bz2 podman-c004978ea895e5b9a4f67388caba11fa893f586c.zip | |
Fix hang in build-each-commit test
Followup to #14178: I broke CI. "--fork-point" does not do
what I thought it did, so remove it.
Also, add 'set -x' to help us debug the next time something
like this happens.
Signed-off-by: Ed Santiago <santiago@redhat.com>
| -rwxr-xr-x | contrib/cirrus/runner.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index 1ec18c861..83a81bd0a 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -246,6 +246,7 @@ function _run_altbuild() { # shellcheck disable=SC2154 msg "Performing alternate build: $ALT_NAME" msg "************************************************************" + set -x cd $GOSRC case "$ALT_NAME" in *Each*) @@ -260,7 +261,7 @@ function _run_altbuild() { context_dir=$(mktemp -d --tmpdir make-size-check.XXXXXXX) savedhead=$(git rev-parse HEAD) # Push to PR base. First run of the script will write size files - pr_base=$(git merge-base --fork-point origin/$DEST_BRANCH) + pr_base=$(git merge-base origin/$DEST_BRANCH HEAD) git checkout $pr_base hack/make-and-check-size $context_dir # pop back to PR, and run incremental makes. Subsequent script |