diff --git a/.travis.yml b/.travis.yml index 22786bf..2a5dc35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,10 +8,7 @@ addons: - llvm-toolchain-precise - llvm-toolchain-precise-3.8 packages: - - gcc-4.8 - - g++-4.8 - clang-3.8 - - lldb-3.8 - stack - bc - zsh @@ -24,10 +21,8 @@ before_install: - $SHELL --version 2> /dev/null || dpkg -s $SHELL 2> /dev/null || which $SHELL - curl --version - wget --version - - clang --version - - clang++ --version - if [ -n "${SHELLCHECK-}" ]; then stack setup && stack install ShellCheck && shellcheck --version ; fi - - if [ -z "${SHELLCHECK-}" ]; then sudo ln -sf /usr/bin/clang-3.8 /usr/bin/clang && sudo ln -sf /usr/bin/clang++-3.8 /usr/bin/clang++ && clang --version ; fi + - mkdir -p "$HOME"/bin && ln -s /usr/bin/clang-3.8 "$HOME"/bin/clang && ln -s /usr/bin/clang++-3.8 "$HOME"/bin/clang++ install: - (mkdir /tmp/urchin && cd /tmp/urchin && curl -s "$(curl -s https://registry.npmjs.com/urchin | grep -Eo '"tarball":\s*"[^"]+"' | tail -n 1 | awk -F\" '{ print $4 }')" -O && tar -x -f urchin*) - chmod +x /tmp/urchin/package/urchin @@ -37,8 +32,6 @@ script: - if [ -z "${SHELLCHECK-}" ]; then make TEST_SUITE=$TEST_SUITE URCHIN=/tmp/urchin/package/urchin test-$SHELL ; fi env: global: - - CXX=g++-4.8 - - CC=gcc-4.8 - PATH=$(echo $PATH | sed 's/::/:/') - NVM_DIR="${TRAVIS_BUILD_DIR}" matrix: