diff options
| author | liushuyu <liushuyu011@gmail.com> | 2018-06-08 02:01:36 -0600 |
|---|---|---|
| committer | fearlessTobi <thm.frey@gmail.com> | 2018-08-29 15:28:13 +0200 |
| commit | a2c97de929aec6747ad039b1888c1bd6c59accb8 (patch) | |
| tree | 1a3b88c85a1267caa910d60ad725f12a0fd3a28e | |
| parent | 4d7e1662c84ef65f7da5a27b0473125cc6759d5c (diff) | |
travis: share env variables with Docker
| -rw-r--r-- | .travis/common/travis-ci.env | 15 | ||||
| -rwxr-xr-x | .travis/linux/build.sh | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/.travis/common/travis-ci.env b/.travis/common/travis-ci.env new file mode 100644 index 000000000..7d63674b4 --- /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/build.sh b/.travis/linux/build.sh index 213feb25b..43b806510 100755 --- a/.travis/linux/build.sh +++ b/.travis/linux/build.sh @@ -1,3 +1,3 @@ #!/bin/bash -ex -docker run -e CCACHE_DIR=/ccache -v $HOME/.ccache:/ccache -v $(pwd):/yuzu ubuntu:18.04 /bin/bash /yuzu/.travis/linux/docker.sh +docker run -e CCACHE_DIR=/ccache -v $HOME/.ccache:/ccache --env-file .travis/common/travis-ci.env -v $(pwd):/yuzu ubuntu:18.04 /bin/bash /yuzu/.travis/linux/docker.sh |