travis: Remove ubuntu-r-toolchain/test ppa

Use unversioned gcc/gcov commands rather than pulling in a separate
repo.
This commit is contained in:
James McCoy 2018-01-01 21:19:58 -05:00
parent 90aae43984
commit dc1444e112
No known key found for this signature in database
GPG Key ID: DFE691AE331BA3DB

View File

@ -59,32 +59,32 @@ jobs:
CMAKE_FLAGS="$CMAKE_FLAGS -DPREFER_LUA=ON" CMAKE_FLAGS="$CMAKE_FLAGS -DPREFER_LUA=ON"
- stage: normal builds - stage: normal builds
os: linux os: linux
compiler: gcc-5 compiler: gcc
env: FUNCTIONALTEST=functionaltest-lua env: FUNCTIONALTEST=functionaltest-lua
- os: linux - os: linux
# Travis creates a cache per compiler. # Travis creates a cache per compiler.
# Set a different value here to store 32-bit # Set a different value here to store 32-bit
# dependencies in a separate cache. # dependencies in a separate cache.
compiler: gcc-5 -m32 compiler: gcc -m32
env: BUILD_32BIT=ON env: BUILD_32BIT=ON
- os: osx - os: osx
compiler: clang compiler: clang
osx_image: xcode7.3 # macOS 10.11 osx_image: xcode7.3 # macOS 10.11
- os: osx - os: osx
compiler: gcc-4.9 compiler: gcc
osx_image: xcode7.3 # macOS 10.11 osx_image: xcode7.3 # macOS 10.11
- stage: lint - stage: lint
os: linux os: linux
env: CI_TARGET=lint env: CI_TARGET=lint
- stage: Flaky builds - stage: Flaky builds
os: linux os: linux
compiler: gcc-5 compiler: gcc
env: GCOV=gcov-5 CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON" env: GCOV=gcov CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON"
- os: linux - os: linux
compiler: clang compiler: clang
env: CLANG_SANITIZER=TSAN env: CLANG_SANITIZER=TSAN
allow_failures: allow_failures:
- env: GCOV=gcov-5 CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON" - env: GCOV=gcov CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON"
- env: CLANG_SANITIZER=TSAN - env: CLANG_SANITIZER=TSAN
fast_finish: true fast_finish: true
@ -97,8 +97,6 @@ after_success: ci/after_success.sh
addons: addons:
apt: apt:
sources:
- ubuntu-toolchain-r-test
packages: packages:
- autoconf - autoconf
- automake - automake
@ -107,9 +105,7 @@ addons:
- clang - clang
- cmake - cmake
- cscope - cscope
- g++-5-multilib
- g++-multilib - g++-multilib
- gcc-5-multilib
- gcc-multilib - gcc-multilib
- gdb - gdb
- language-pack-tr - language-pack-tr