opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 18:08:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14209 from edsantiago/investigate_bloat_hang

Browse Source 
Fix hang in build-each-commit test
This commit is contained in:
OpenShift Merge Robot
2022-05-12 04:24:53 -04:00
committed by GitHub
parent 1a99a28e47 37e30bcb27
commit f65e13eb7a
1 changed files with 2 additions and 1 deletions
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 # shellcheck disable=SC2154
msg "Performing alternate build: $ALT_NAME" msg "Performing alternate build: $ALT_NAME"
msg "************************************************************" msg "************************************************************"
set -x
cd $GOSRC cd $GOSRC
case "$ALT_NAME" in case "$ALT_NAME" in
*Each*) *Each*)
@ -260,7 +261,7 @@ function _run_altbuild() {
context_dir=$(mktemp -d --tmpdir make-size-check.XXXXXXX) context_dir=$(mktemp -d --tmpdir make-size-check.XXXXXXX)
savedhead=$(git rev-parse HEAD) savedhead=$(git rev-parse HEAD)
# Push to PR base. First run of the script will write size files # 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 git checkout $pr_base
hack/make-and-check-size $context_dir hack/make-and-check-size $context_dir
# pop back to PR, and run incremental makes. Subsequent script # pop back to PR, and run incremental makes. Subsequent script