Skip to content

Commit

Permalink
fix travis tests
Browse files Browse the repository at this point in the history
  • Loading branch information
andy5995 committed Sep 2, 2018
1 parent af31252 commit ba96734
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
14 changes: 5 additions & 9 deletions .travis-before_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,8 @@ if [ "$Compiler_version" != "" ] && [ "$Compiler_version" != "default" ]; then
fi
set -x
if [ "$VersionAvByDefault" = "" ]; then
if [ "$Compiler_name" = "gcc" ]; then
# ubuntu test toolchain needed for more recent version of gcc
sudo add-apt-repository --yes "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu ${codename} main"
fi
# ubuntu test toolchain needed for more recent version of gcc and clang-6.0
sudo add-apt-repository --yes "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu ${codename} main"
fi
fi
Expand All @@ -53,12 +50,11 @@ if [ "$Compiler_version" != "" ] && [ "$Compiler_version" != "default" ]; then
sudo apt-get --allow-unauthenticated install -qq --force-yes gcc-${Compiler_version} g++-${Compiler_version}
fi
elif [ "$Compiler_name" = "clang" ]; then
export DEBIAN_FRONTEND=noninteractive
# llvm-toolchain needed for more recent version of clang
echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-6.0 main" | sudo tee -a /etc/apt/sources.list >/dev/null
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo -E apt-add-repository "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-6.0 main"
sudo -E apt-get -yq update &>> ~/apt-get-update.log
sudo -E apt-get -yq --allow-unauthenticated --no-install-suggests \
sudo -E apt-get -yq --no-install-suggests --allow-unauthenticated \
--no-install-recommends $TRAVIS_APT_OPTS install clang-${Compiler_version}
fi
fi
Expand Down
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,15 @@ matrix:
compiler: gcc
env: Tr_Compiler_Version="8"
- os: linux
# clang
compiler: clang
env: Tr_Compiler_Version="default"
- os: linux
compiler: clang
env: Tr_Compiler_Version="6.0"
# osx
- os: osx
osx_image: xcode9.2
- os: osx
osx_image: xcode9.3beta

Expand Down

0 comments on commit ba96734

Please sign in to comment.