diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-01-08 12:35:02 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2019-01-09 13:39:46 +0100 |
| commit | ffc07927985c3bb7a9ccd569c995a3c869483e9d (patch) | |
| tree | c043007bead39be14d457329b98bbf4d4e7348f6 | |
| parent | 5f0e3b6849681e3a712fe2adc93b2c24c93ee4cd (diff) | |
Travis: Use pip to install SCons on OSX
Not sure why we switched from homebrew to scons-local anymore,
but pip should work just fine and is recommended by upstream.
Downloads of scons-local from SourceForge were quite iffy, so
this should help avoid CI errors due to not having downloaded
SCons successfully.
Setting Python's user binary PATH seems necessary on Travis/OSX
as per travis-ci/travis-ci#5030 (confirmed that 'scons' is not
in PATH without it).
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rwxr-xr-x | misc/travis/scons-local-osx.sh | 18 |
2 files changed, 2 insertions, 19 deletions
diff --git a/.travis.yml b/.travis.yml index a8bc8289e4..c3302cf806 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,7 +87,8 @@ install: misc/travis/android-tools-linux.sh; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then - misc/travis/scons-local-osx.sh; + pip install --user scons; + export PATH=${PATH}:/Users/travis/Library/Python/2.7/bin; fi - if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$PLATFORM" = "android" ]; then misc/travis/android-tools-osx.sh; diff --git a/misc/travis/scons-local-osx.sh b/misc/travis/scons-local-osx.sh deleted file mode 100755 index fe7b43aadc..0000000000 --- a/misc/travis/scons-local-osx.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -echo -echo "Download and install Scons local package ..." -echo - -echo "Downloading sources ..." -curl -L -O https://downloads.sourceforge.net/scons/scons-local-3.0.1.zip # latest version available here: http://scons.org/pages/download.html - -echo "Extracting to build directory ..." -unzip -qq -n scons-local-3.0.1.zip -d $TRAVIS_BUILD_DIR/scons-local - -echo "Installing symlinks ..." -ln -s $TRAVIS_BUILD_DIR/scons-local/scons.py /usr/local/bin/scons - -echo -echo "Done!" -echo |