Use export for Travis variable for convenience

This way, we don't need to set the environment variable in the
`trigger_build.sh` script.
This commit is contained in:
Robert Schäfer 2018-12-10 00:27:55 +01:00
parent 0a8aadbb2d
commit 4489bbe662
2 changed files with 3 additions and 7 deletions

View File

@ -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

5
scripts/trigger.sh → scripts/trigger_build.sh Executable file → Normal file
View File

@ -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"
}
}
}