diff --git a/.travis.yml b/.travis.yml index 489d0cc75..de984cc66 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,11 +9,10 @@ services: - docker env: - global: - - DOCKER_COMPOSE_VERSION=1.23.2 - - COMMON_BRANCH=master + - COMMON_BRANCH=master before_install: + - export DOCKER_COMPOSE_VERSION=1.23.2 - sudo rm /usr/local/bin/docker-compose - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose - chmod +x docker-compose diff --git a/scripts/trigger.sh b/scripts/trigger_build.sh old mode 100755 new mode 100644 similarity index 81% rename from scripts/trigger.sh rename to scripts/trigger_build.sh index ef430dc2c..bac40e3a0 --- a/scripts/trigger.sh +++ b/scripts/trigger_build.sh @@ -8,10 +8,7 @@ body=$(cat<< EOF "config": { "merge_mode": "deep_merge", "env": { - "global": { - "DOCKER_COMPOSE_VERSION":"1.23.2", - "COMMON_BRANCH": "$TRAVIS_BRANCH" - } + "COMMON_BRANCH": "$TRAVIS_BRANCH" } } }