Explorar o código

Merge pull request #1202 from FearlessTobi/port-3825

Port #3825 from Citra: "travis: share environment variables with Docker"
bunnei %!s(int64=8) %!d(string=hai) anos
pai
achega
42ef40884f
Modificáronse 2 ficheiros con 13 adicións e 1 borrados
  1. 12 0
      .travis/common/travis-ci.env
  2. 1 1
      .travis/linux/build.sh

+ 12 - 0
.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

+ 1 - 1
.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