summaryrefslogtreecommitdiff
path: root/contrib/cirrus
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2022-05-11 17:11:53 -0600
committerEd Santiago <santiago@redhat.com>2022-05-11 18:45:13 -0600
commit37e30bcb278bb6e0ea8ccf2832aba1f29842a9fa (patch)
tree635da0543a6509f4b566949a76ba5846995bb4bf /contrib/cirrus
parent1b8e9c2ca799063016e9fa765e124b9b8cec67a8 (diff)
downloadpodman-37e30bcb278bb6e0ea8ccf2832aba1f29842a9fa.tar.gz
podman-37e30bcb278bb6e0ea8ccf2832aba1f29842a9fa.tar.bz2
podman-37e30bcb278bb6e0ea8ccf2832aba1f29842a9fa.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>
Diffstat (limited to 'contrib/cirrus')
-rwxr-xr-xcontrib/cirrus/runner.sh3
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