Skip to content

Commit

Permalink
Merge 1d89643 into 3a11b90
Browse files Browse the repository at this point in the history
  • Loading branch information
jsteemann committed Nov 15, 2021
2 parents 3a11b90 + 1d89643 commit 3ee2830
Showing 1 changed file with 7 additions and 27 deletions.
34 changes: 7 additions & 27 deletions .travis.yml
Expand Up @@ -38,23 +38,7 @@ matrix:
apt:
packages: ['gcc-9', 'g++-9', 'cmake']

- name: "address sanitizer build, g++-8"
if: branch = main AND false #disabled
env:
- ARCH=amd64
#compiler
- CXX=g++-8
- CC=gcc-8
#build settings
- build_type=Release
- SANITIZER=true
- CXX_STANDARD=17
addons:
apt:
packages: ['gcc-8', 'g++-8', 'cmake']

- name: "address sanitizer build, g++-9"
if: branch = main AND false #disabled
env:
- ARCH=amd64
#compiler
Expand All @@ -69,7 +53,6 @@ matrix:
packages: ['gcc-9', 'g++-9', 'cmake']

- name: "coverage build, g++-9"
if: branch = main
env:
- ARCH=amd64
#compiler
Expand All @@ -86,24 +69,21 @@ matrix:
- ./scripts/travis-build.sh
- ./scripts/travis-after-success.sh

- name: "clang build, clang++-9"
if: branch = main AND false # disabled because of clang ICE
compiler: clang++-9
- name: "clang build, clang++-10"
compiler: clang++-10
env:
- ARCH=amd64
#compiler
- COMPILER=clang++-9
- CXX=clang++-9
- CC=clang-9
- COMPILER=clang++-10
- CXX=clang++-10
- CC=clang-10
#build settings
- build_type=Release
- CXX_STANDARD=17
- LDFLAGS="-fuse-ld=lld"
addons:
apt:
sources:
- sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main'
key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
packages: ['clang-9', 'clang++-9', 'clang-format-9', 'clang-tools-9', 'cmake']
packages: ['clang-10', 'clang++-10', 'clang-format-10', 'clang-tools-10', 'lld-10', 'cmake']

- name: "mac"
os: osx
Expand Down

0 comments on commit 3ee2830

Please sign in to comment.