summaryrefslogtreecommitdiff
path: root/contrib/cirrus
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2022-04-25 15:33:11 -0400
committerChris Evich <cevich@redhat.com>2022-04-25 15:33:11 -0400
commitc5e48f12ecff8b1e66e60ef4ade4d7341720269f (patch)
tree27fd7e5ec72398b741a32653c17a78d7e36aa8d8 /contrib/cirrus
parenteb4e53087e60e8655d8ba0855e5526dc350cb963 (diff)
downloadpodman-c5e48f12ecff8b1e66e60ef4ade4d7341720269f.tar.gz
podman-c5e48f12ecff8b1e66e60ef4ade4d7341720269f.tar.bz2
podman-c5e48f12ecff8b1e66e60ef4ade4d7341720269f.zip
Cirrus: Re-fix build-cache miss on main
After merging #13998 it was observed that the `docker-py` task was still failing with the same error on `main`. The original quick-fix had placed the full-build (`make`) call too late in the process. This commit moves it up to right before the `make install` call which was resulting in an error. Again, a further future commit is planned to re-work and simplify the entire cache setup. This is only a quick fix to make branch-builds pass. Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus')
-rwxr-xr-xcontrib/cirrus/setup_environment.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index a7d0f7fa1..742289733 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -268,7 +268,7 @@ case "$TEST_FLAVOR" in
;;
docker-py)
remove_packaged_podman_files
- make install PREFIX=/usr ETCDIR=/etc
+ make && make install PREFIX=/usr ETCDIR=/etc
msg "Installing previously downloaded/cached packages"
dnf install -y $PACKAGE_DOWNLOAD_DIR/python3*.rpm