diff options
| author |  bunnei | 2018-08-30 09:54:32 -0400 |
|---|---|---|
| committer |  GitHub | 2018-08-30 09:54:32 -0400 |
| commit | 42ef40884f222bfd0dfa08cd56e01e89b0e2ab0f (patch) | |
| tree | 7935496fe82d6e89fa490ccd19ae74207b934390 | |
| parent | Merge pull request #1172 from tech4me/impl_iadd3 (diff) | |
| parent | Remove Citra specific variable (diff) | |
| download | yuzu-42ef40884f222bfd0dfa08cd56e01e89b0e2ab0f.tar.gz yuzu-42ef40884f222bfd0dfa08cd56e01e89b0e2ab0f.tar.xz yuzu-42ef40884f222bfd0dfa08cd56e01e89b0e2ab0f.zip | |
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 @@ | |||
| 1 | # List of environment variables to be shared with Docker containers | ||
| 2 | CI | ||
| 3 | TRAVIS | ||
| 4 | CONTINUOUS_INTEGRATION | ||
| 5 | TRAVIS_BRANCH | ||
| 6 | TRAVIS_BUILD_ID | ||
| 7 | TRAVIS_BUILD_NUMBER | ||
| 8 | TRAVIS_COMMIT | ||
| 9 | TRAVIS_JOB_ID | ||
| 10 | TRAVIS_JOB_NUMBER | ||
| 11 | TRAVIS_REPO_SLUG | ||
| 12 | 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 @@ | |||
| 1 | #!/bin/bash -ex | 1 | #!/bin/bash -ex |
| 2 | 2 | ||
| 3 | docker run -e CCACHE_DIR=/ccache -v $HOME/.ccache:/ccache -v $(pwd):/yuzu ubuntu:18.04 /bin/bash /yuzu/.travis/linux/docker.sh | 3 | 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 |