From a2c97de929aec6747ad039b1888c1bd6c59accb8 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Fri, 8 Jun 2018 02:01:36 -0600 Subject: [PATCH 1/2] travis: share env variables with Docker --- .travis/common/travis-ci.env | 15 +++++++++++++++ .travis/linux/build.sh | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) 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 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 From 02dfbf961e92cc15408a1d1cf84fb2ef61be0bd8 Mon Sep 17 00:00:00 2001 From: fearlessTobi Date: Wed, 29 Aug 2018 15:29:37 +0200 Subject: [PATCH 2/2] Remove Citra specific variable --- .travis/common/travis-ci.env | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis/common/travis-ci.env b/.travis/common/travis-ci.env index 7d63674b4..a333786ce 100644 --- a/.travis/common/travis-ci.env +++ b/.travis/common/travis-ci.env @@ -10,6 +10,3 @@ TRAVIS_JOB_ID TRAVIS_JOB_NUMBER TRAVIS_REPO_SLUG TRAVIS_TAG - -# citra specific flags -ENABLE_COMPATIBILITY_REPORTING