Merge pull request #3825 from liushuyu/master
travis: share environment variables with Docker
This commit is contained in:
commit
e52d93bc58
15
.travis/common/travis-ci.env
Normal file
15
.travis/common/travis-ci.env
Normal file
@ -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
|
@ -1,4 +1,4 @@
|
|||||||
#!/bin/bash -ex
|
#!/bin/bash -ex
|
||||||
mkdir -p "$HOME/.ccache"
|
mkdir -p "$HOME/.ccache"
|
||||||
docker pull ubuntu:18.04
|
docker pull ubuntu:18.04
|
||||||
docker run -e ENABLE_COMPATIBILITY_REPORTING -v $(pwd):/citra -v "$HOME/.ccache":/root/.ccache ubuntu:18.04 /bin/bash -ex /citra/.travis/linux-frozen/docker.sh
|
docker run --env-file .travis/common/travis-ci.env -v $(pwd):/citra -v "$HOME/.ccache":/root/.ccache ubuntu:18.04 /bin/bash -ex /citra/.travis/linux-frozen/docker.sh
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
#!/bin/bash -ex
|
#!/bin/bash -ex
|
||||||
mkdir -p "$HOME/.ccache"
|
mkdir -p "$HOME/.ccache"
|
||||||
docker run -e ENABLE_COMPATIBILITY_REPORTING -v $(pwd):/citra -v "$HOME/.ccache":/root/.ccache ubuntu:18.04 /bin/bash -ex /citra/.travis/linux/docker.sh
|
docker run --env-file .travis/common/travis-ci.env -v $(pwd):/citra -v "$HOME/.ccache":/root/.ccache ubuntu:18.04 /bin/bash -ex /citra/.travis/linux/docker.sh
|
||||||
|
Loading…
Reference in New Issue
Block a user