erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-11-06 07:57:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix hang in build-each-commit test

Browse source 
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>
This commit is contained in:
Ed Santiago 2022-05-11 17:11:53 -06:00
parent 1b8e9c2ca7
commit 37e30bcb27
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
contrib/cirrus/runner.sh
View file

@ -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