diff --git a/.travis.yml b/.travis.yml index 32b6f21..1df2d50 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,17 +15,9 @@ matrix: osx_image: xcode7.3 env: BUILD_PLATFORM="Darwin-x64" -before_install: - # GCC 4.9 - - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - - sudo apt-get update -qq - install: - buildscripts/1-install-deps-travis.sh - export PATH="/data/bin:$PATH" - # GCC 4.9 - - sudo apt-get install -qq g++-4.9 - - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.9 90 script: - CMAKE_BUILD_TYPE=Debug buildscripts/2-build-travis.sh diff --git a/buildscripts/1-install-deps-travis.sh b/buildscripts/1-install-deps-travis.sh index 311e708..7a1ab0b 100755 --- a/buildscripts/1-install-deps-travis.sh +++ b/buildscripts/1-install-deps-travis.sh @@ -25,14 +25,18 @@ then GITHUB_RELEASE_TOOL_ARCH="linux_amd64" wget https://github.com/paulthomson/build-angle/releases/download/v-592879ad24e66c7c68c3a06d4e2227630520da36/Linux-x64-Release.zip unzip Linux-x64-Release.zip + + # The JSON library requires GCC >= 4.9 + sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y; + sudo apt-get update -qq + sudo apt-get install -qq -y g++-4.9 + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.9 90 + fi cd .. - pushd /data/bin wget "https://github.com/${GITHUB_RELEASE_TOOL_USER}/github-release/releases/download/${GITHUB_RELEASE_TOOL_VERSION}/github-release_${GITHUB_RELEASE_TOOL_VERSION}_${GITHUB_RELEASE_TOOL_ARCH}.tar.gz" tar xf "github-release_${GITHUB_RELEASE_TOOL_VERSION}_${GITHUB_RELEASE_TOOL_ARCH}.tar.gz" popd - -