Fix travis buildenv in prepare_tarball

.travis.yml

@@ -38,7 +38,7 @@ jobs:
     stage: "Build"
     env:
     - CROSS_COMPILE=mingw32
-    - CONTAINER=cross
+    - CONTAINER=archlinux
     - INSTALL_DIR="sfizz-${TRAVIS_BRANCH}-mingw32"
     before_install: .travis/before_install_mingw.sh
     install: .travis/install_mingw.sh
@@ -48,7 +48,7 @@ jobs:
   - name: "Windows mingw64"
     env:
     - CROSS_COMPILE=mingw64
-    - CONTAINER=cross
+    - CONTAINER=archlinux
     - INSTALL_DIR="sfizz-${TRAVIS_BRANCH}-mingw64"
     before_install: .travis/before_install_mingw.sh
     install: .travis/install_mingw.sh

.travis/before_install_mingw.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -ex
-. .travis/mingw_container.sh
+. .travis/docker_container.sh
 
 buildenv bash -c "echo Hello from container" # ensure to start the container
 docker cp "$container":/etc/pacman.conf pacman.conf

.travis/docker_container.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 buildenv() {
-  setup_container archlinux
+  setup_container "$CONTAINER"
   docker exec -w "$(pwd)" -i -t "$container" "$@"
 }
 

.travis/install_mingw.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -ex
-. .travis/mingw_container.sh
+. .travis/docker_container.sh
 
 buildenv pacman -Sqy --noconfirm
 buildenv pacman -Sq --noconfirm base-devel wget mingw-w64-cmake mingw-w64-gcc mingw-w64-pkg-config mingw-w64-libsndfile

.travis/no_container.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+buildenv() {
+  "$@"
+}

.travis/prepare_tarball.sh

@@ -1,7 +1,12 @@
 #!/bin/bash
 
 set -ex
-. .travis/mingw_container.sh
+
+if ! [ -z "$CONTAINER" ]; then
+  . .travis/docker_container.sh
+else
+  . .travis/no_container.sh
+fi
 
 # Do not prepare a tarball without a tag
 if [[ ${TRAVIS_TAG} == "" ]]; then

.travis/script_mingw.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -ex
-. .travis/mingw_container.sh
+. .travis/docker_container.sh
 
 mkdir -p build/${INSTALL_DIR} && cd build
 if [[ ${CROSS_COMPILE} == "mingw32" ]]; then