From 54d41f680507fa554f48217005133d7f50c04929 Mon Sep 17 00:00:00 2001 From: Zion Nimchuk Date: Sun, 30 Dec 2018 16:37:43 -0800 Subject: [PATCH] Migrate to seperate file for environmental variables --- .travis.yml | 4 ++-- .travis/travis.env | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 .travis/travis.env diff --git a/.travis.yml b/.travis.yml index 86815e2483..82dd95a865 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ matrix: services: docker cache: ccache install: "docker pull rpcs3/rpcs3-travis-trusty:1.0" - script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache -e TRAVIS_PULL_REQUEST -e TRAVIS_BRANCH -e UPLOAD_URL -e COMPILER rpcs3/rpcs3-travis-trusty:1.0 /bin/bash -ex /rpcs3/.travis/build-linux.bash' + script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .travis/travis.env rpcs3/rpcs3-travis-trusty:1.0 /bin/bash -ex /rpcs3/.travis/build-linux.bash' - os: linux env: - NAME="Linux build" @@ -19,7 +19,7 @@ matrix: services: docker cache: ccache install: "docker pull rpcs3/rpcs3-travis-trusty:1.0" - script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache -e TRAVIS_PULL_REQUEST -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e COMPILER -e UPLOAD_URL -e DEPLOY_APPIMAGE rpcs3/rpcs3-travis-trusty:1.0 /bin/bash -ex /rpcs3/.travis/build-linux.bash' + script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .travis/travis.env rpcs3/rpcs3-travis-trusty:1.0 /bin/bash -ex /rpcs3/.travis/build-linux.bash' - os: osx osx_image: xcode10 script: "/bin/bash -ex .travis/build-mac.bash" diff --git a/.travis/travis.env b/.travis/travis.env new file mode 100644 index 0000000000..09f875c772 --- /dev/null +++ b/.travis/travis.env @@ -0,0 +1,9 @@ +# Variables set by Travis CI +TRAVIS_PULL_REQUEST +TRAVIS_BRANCH +TRAVIS_COMMIT +# Variables for Travis build matrix +COMPILER +DEPLOY_APPIMAGE +# Private Travis CI variables +GITHUB_TOKEN