diff options
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/cirrus/runner.sh | 12 | ||||
| -rw-r--r-- | contrib/helloimage/README.md | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index 1bff07203..f33c6af29 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -228,7 +228,17 @@ function _run_altbuild() { case "$ALT_NAME" in *Each*) git fetch origin - make build-all-new-commits GIT_BASE_BRANCH=origin/$DEST_BRANCH + # The check-size script, introduced 2022-03-22 in #13518, + # runs 'make' (the original purpose of this check) against + # each commit, then checks image sizes to make sure that + # none have grown beyond a given limit. That of course + # requires a baseline, which is why we use '^' to start + # with the *parent* commit of this PR, not the first commit. + context_dir=$(mktemp -d --tmpdir make-size-check.XXXXXXX) + make build-all-new-commits \ + GIT_BASE_BRANCH=origin/"${DEST_BRANCH}^" \ + MAKE="hack/make-and-check-size $context_dir" + rm -rf $context_dir ;; *Windows*) make podman-remote-release-windows_amd64.zip diff --git a/contrib/helloimage/README.md b/contrib/helloimage/README.md index ca69f87b4..528466f7b 100644 --- a/contrib/helloimage/README.md +++ b/contrib/helloimage/README.md @@ -12,7 +12,7 @@ Using this image is helpful to: * Prove that basic Podman operations are working on the host. * Shows that the image was pulled from the quay.io container registry. - * Container creation was successfuly accomplished. (`podman ps -a`) + * Container creation was successfully accomplished. (`podman ps -a`) * The created container was able to stream output to your terminal. ## Directory Contents |