summaryrefslogtreecommitdiff
path: root/contrib/cirrus/setup_environment.sh
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2019-08-01 07:31:04 -0400
committerChris Evich <cevich@redhat.com>2019-08-28 11:54:06 -0400
commit370b1a887cbf6db8ac893c39118cf8c6c2fd663c (patch)
tree33fb752adc3957916890103fcc8ff68a57b8a1a5 /contrib/cirrus/setup_environment.sh
parent8e46106f420dfc6125750c12e13c5ae39be9d6f1 (diff)
downloadpodman-370b1a887cbf6db8ac893c39118cf8c6c2fd663c.tar.gz
podman-370b1a887cbf6db8ac893c39118cf8c6c2fd663c.tar.bz2
podman-370b1a887cbf6db8ac893c39118cf8c6c2fd663c.zip
Cirrus: Reimplement release archive + upload
The initial implementation was far more complicated than necessary. Strip out the complexities in favor of a simpler and more direct approach. Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
-rwxr-xr-xcontrib/cirrus/setup_environment.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 2579229a5..323a05489 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -66,7 +66,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
@@ -88,8 +89,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