diff options
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rwxr-xr-x | ci/install-linux.sh | 5 |
2 files changed, 3 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 61c51dd2..db199c84 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,28 +11,26 @@ language: cpp matrix: include: - os: linux - dist: trusty sudo: required - group: deprecated-2017Q3 before_install: chmod -R +x ./ci/*platformio.sh install: ./ci/install-platformio.sh script: ./ci/build-platformio.sh - os: linux + dist: xenial compiler: gcc sudo : true install: ./ci/install-linux.sh && ./ci/log-config.sh script: ./ci/build-linux-bazel.sh - os: linux + dist: xenial compiler: clang sudo : true install: ./ci/install-linux.sh && ./ci/log-config.sh script: ./ci/build-linux-bazel.sh - os: linux - group: deprecated-2017Q4 compiler: gcc env: BUILD_TYPE=Debug VERBOSE=1 CXX_FLAGS=-std=c++11 - os: linux - group: deprecated-2017Q4 compiler: clang env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 -Wgnu-zero-variadic-macro-arguments - os: linux diff --git a/ci/install-linux.sh b/ci/install-linux.sh index a4caf440..05e2cb28 100755 --- a/ci/install-linux.sh +++ b/ci/install-linux.sh @@ -41,10 +41,7 @@ if [ "${TRAVIS_SUDO}" = "true" ]; then echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" | \ sudo tee /etc/apt/sources.list.d/bazel.list curl https://bazel.build/bazel-release.pub.gpg | sudo apt-key add - - sudo apt-get update && sudo apt-get install -y gcc-4.9 g++-4.9 clang-3.9 - sudo wget https://github.com/bazelbuild/bazel/releases/download/0.26.1/bazel-0.26.1-installer-linux-x86_64.sh - sudo chmod +x bazel-0.26.1-installer-linux-x86_64.sh - sudo ./bazel-0.26.1-installer-linux-x86_64.sh + sudo apt-get update && sudo apt-get install -y bazel gcc-4.9 g++-4.9 clang-3.9 elif [ "${CXX}" = "clang++" ]; then # Use ccache, assuming $HOME/bin is in the path, which is true in the Travis build environment. ln -sf /usr/bin/ccache $HOME/bin/${CXX}; |