diff options
| author | bunnei <bunneidev@gmail.com> | 2018-08-30 09:54:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-30 09:54:32 -0400 |
| commit | 42ef40884f222bfd0dfa08cd56e01e89b0e2ab0f (patch) | |
| tree | 7935496fe82d6e89fa490ccd19ae74207b934390 | |
| parent | 6e73039eb5a595e4e648968288306f7046f5ddf9 (diff) | |
| parent | 02dfbf961e92cc15408a1d1cf84fb2ef61be0bd8 (diff) | |
Merge pull request #1202 from FearlessTobi/port-3825
Port #3825 from Citra: "travis: share environment variables with Docker"
| -rw-r--r-- | .travis/common/travis-ci.env | 12 | ||||
| -rwxr-xr-x | .travis/linux/build.sh | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/.travis/common/travis-ci.env b/.travis/common/travis-ci.env new file mode 100644 index 000000000..a333786ce --- /dev/null +++ b/.travis/common/travis-ci.env @@ -0,0 +1,12 @@ +# 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 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 |