fix global env var

qgis · Nov 17, 2018 · aebb6ef · aebb6ef
1 parent 614809c
commit aebb6ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.ci/travis/linux/script.sh b/.ci/travis/linux/script.sh
@@ -18,7 +18,7 @@ set -e
 
 mkdir -p "$CCACHE_DIR"
 
-if [[ DOCKER_BUILD_QGIS_IMAGE =~ true ]]; then
+if [[ ${DOCKER_BUILD_QGIS_IMAGE} =~ true ]]; then
   # building docker images
   DIR=$(git rev-parse --show-toplevel)/.docker
   pushd "${DIR}"
@@ -34,5 +34,5 @@ if [[ DOCKER_BUILD_QGIS_IMAGE =~ true ]]; then
   popd
 else
   # running tests
-  docker-compose -f "${DOCKER_COMPOSE}" run --rm qgis-deps
+  docker-compose -f ${TRAVIS_BUILD_DIR}/.docker/docker-compose.travis.yml run --rm qgis-deps
 fi
diff --git a/.travis.yml b/.travis.yml
@@ -10,8 +10,8 @@ cache:
     - $HOME/.ccache
   timeout: 1000
 
-global:
-  env:
+env:
+  global:
     - TRAVIS_TIMESTAMP=$(date +%s)
     - CCACHE_DIR=${HOME}/.ccache