diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-10 11:04:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-10 11:04:43 +0100 |
| commit | bcb201c60aba58add4b1a9bfa3289f3ea7477ccb (patch) | |
| tree | 9bc4406c44320fdb5be24458629c469b03576ddc | |
| parent | 37432587f90cc666e3a6d361ac5c0bea723cb44c (diff) | |
| parent | 83ec7cc42568a730e003b61092e3fd71152a22c4 (diff) | |
Merge pull request #36074 from akien-mga/travis-python3
Travis: Use Python 3 for SCons
| -rw-r--r-- | .travis.yml | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index c8b123c79c..d39d6383ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,12 +72,20 @@ matrix: env: PLATFORM=osx TOOLS=yes TARGET=debug CACHE_NAME=${PLATFORM}-tools-clang EXTRA_ARGS="warnings=extra werror=yes" os: osx compiler: clang + addons: + homebrew: + packages: + - scons - name: iOS export template (debug, Clang) stage: build env: PLATFORM=iphone TOOLS=no TARGET=debug CACHE_NAME=${PLATFORM}-clang os: osx compiler: clang + addons: + homebrew: + packages: + - scons - name: Linux headless editor (release_debug, GCC 9, testing project exporting and script running) stage: build @@ -109,16 +117,17 @@ before_install: fi install: - - pip install --user scons; + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then + pyenv global 3.7.1 system; + pip3 install --user scons; + fi + - scons --version - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$PLATFORM" = "android" ]; then export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64; export PATH=/usr/lib/jvm/java-8-openjdk-amd64/jre/bin:${PATH}; java -version; misc/travis/android-tools-linux.sh; fi - - if [ "$TRAVIS_OS_NAME" = "osx" ]; then - export PATH=${PATH}:/Users/travis/Library/Python/2.7/bin; - fi before_script: - if [ "$PLATFORM" = "android" ]; then |