diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-29 06:56:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-29 06:56:43 -0700 |
| commit | ab5f52c0d2ce617f875ef69c9ae67381841a6514 (patch) | |
| tree | ccc70cbe33c74a1f55187d3ff0bc05f27a6ffa92 /contrib/cirrus/setup_environment.sh | |
| parent | 1eb6b271bb1b197c214b9cf560c362a6aeb402da (diff) | |
| parent | 370b1a887cbf6db8ac893c39118cf8c6c2fd663c (diff) | |
| download | podman-ab5f52c0d2ce617f875ef69c9ae67381841a6514.tar.gz podman-ab5f52c0d2ce617f875ef69c9ae67381841a6514.tar.bz2 podman-ab5f52c0d2ce617f875ef69c9ae67381841a6514.zip | |
Merge pull request #3710 from cevich/release_redo
Release redo
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 463647d2f..7c7659169 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -69,7 +69,8 @@ case "$SPECIALMODE" in remove_packaged_podman_files # we're building from source ;; none) - remove_packaged_podman_files + [[ -n "$CROSS_PLATFORM" ]] || \ + remove_packaged_podman_files ;; endpoint) remove_packaged_podman_files @@ -91,8 +92,6 @@ case "$SPECIALMODE" in in_podman) # Assumed to be Fedora $SCRIPT_BASE/setup_container_environment.sh ;; - windows) ;& # for podman-remote building only - darwin) ;; *) die 111 "Unsupported \$SPECIALMODE: $SPECIALMODE" esac |