From 613593167079ef874faa06095bfa06f39c7013a3 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Fri, 8 Jun 2018 02:01:36 -0600 Subject: [PATCH] travis: share env variables with Docker --- .travis/common/travis-ci.env | 15 +++++++++++++++ .travis/linux-frozen/build.sh | 2 +- .travis/linux/build.sh | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 .travis/common/travis-ci.env diff --git a/.travis/common/travis-ci.env b/.travis/common/travis-ci.env new file mode 100644 index 0000000000..7d63674b4b --- /dev/null +++ b/.travis/common/travis-ci.env @@ -0,0 +1,15 @@ +# List of environment variables to be shared with Docker containers +CI +TRAVIS +CONTINUOUS_INTEGRATION +TRAVIS_BRANCH +TRAVIS_BUILD_ID +TRAVIS_BUILD_NUMBER +TRAVIS_COMMIT +TRAVIS_JOB_ID +TRAVIS_JOB_NUMBER +TRAVIS_REPO_SLUG +TRAVIS_TAG + +# citra specific flags +ENABLE_COMPATIBILITY_REPORTING diff --git a/.travis/linux-frozen/build.sh b/.travis/linux-frozen/build.sh index a6372bd338..d849ceaf21 100755 --- a/.travis/linux-frozen/build.sh +++ b/.travis/linux-frozen/build.sh @@ -1,4 +1,4 @@ #!/bin/bash -ex mkdir -p "$HOME/.ccache" docker pull ubuntu:18.04 -docker run -e ENABLE_COMPATIBILITY_REPORTING -v $(pwd):/citra -v "$HOME/.ccache":/root/.ccache ubuntu:18.04 /bin/bash -ex /citra/.travis/linux-frozen/docker.sh +docker run --env-file .travis/common/travis-ci.env -v $(pwd):/citra -v "$HOME/.ccache":/root/.ccache ubuntu:18.04 /bin/bash -ex /citra/.travis/linux-frozen/docker.sh diff --git a/.travis/linux/build.sh b/.travis/linux/build.sh index 53e8fa6103..499d15b1b7 100755 --- a/.travis/linux/build.sh +++ b/.travis/linux/build.sh @@ -1,3 +1,3 @@ #!/bin/bash -ex mkdir -p "$HOME/.ccache" -docker run -e ENABLE_COMPATIBILITY_REPORTING -v $(pwd):/citra -v "$HOME/.ccache":/root/.ccache ubuntu:18.04 /bin/bash -ex /citra/.travis/linux/docker.sh +docker run --env-file .travis/common/travis-ci.env -v $(pwd):/citra -v "$HOME/.ccache":/root/.ccache ubuntu:18.04 /bin/bash -ex /citra/.travis/linux/docker.sh