diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-05-12 04:24:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-12 04:24:53 -0400 |
| commit | f65e13eb7aa5874faad579bee2ac16170d467845 (patch) | |
| tree | 3e0ef4ea4b2a453f36dc8ea50fea49b749b3000f | |
| parent | 1a99a28e473433a7316db4227e3b056ab9dff5e4 (diff) | |
| parent | 37e30bcb278bb6e0ea8ccf2832aba1f29842a9fa (diff) | |
| download | podman-f65e13eb7aa5874faad579bee2ac16170d467845.tar.gz podman-f65e13eb7aa5874faad579bee2ac16170d467845.tar.bz2 podman-f65e13eb7aa5874faad579bee2ac16170d467845.zip | |
Merge pull request #14209 from edsantiago/investigate_bloat_hang
Fix hang in build-each-commit test
| -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 |