Skip to content

Commit

Permalink
fix global env var
Browse files Browse the repository at this point in the history
  • Loading branch information
3nids committed Nov 17, 2018
1 parent 614809c commit aebb6ef
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .ci/travis/linux/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand All @@ -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
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ cache:
- $HOME/.ccache
timeout: 1000

global:
env:
env:
global:
- TRAVIS_TIMESTAMP=$(date +%s)
- CCACHE_DIR=${HOME}/.ccache

Expand Down

0 comments on commit aebb6ef

Please sign in to comment.