Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

travis tweaks #2789

Merged
merged 1 commit into from Mar 1, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 3 additions & 19 deletions .travis.yml
Expand Up @@ -26,15 +26,10 @@
# THE SOFTWARE.
#

sudo: false

language: cpp

os:
- linux
- osx

dist: xenial
osx_image: xcode10

addons:
apt:
Expand All @@ -53,11 +48,9 @@ install:
- if [ -n "$GCC_VERSION" ]; then export CC="${CC}-${GCC_VERSION}"; fi
- if [ -n "$GCC_VERSION" ]; then export CXX="${CXX}-${GCC_VERSION}"; fi

compiler:
- clang
- gcc

matrix:
fast_finish: true

include:
- os: linux
compiler: gcc
Expand All @@ -67,18 +60,9 @@ matrix:
compiler: gcc
env: GCC_VERSION=7

exclude:
- os: osx
compiler: gcc

- os: linux
compiler: clang

- os: linux
compiler: gcc

fast_finish: true

script:
- if [ $TRAVIS_OS_NAME == linux ]; then chmod +x ./scripts/travis/build-linux.sh ; ./scripts/travis/build-linux.sh ; fi
- if [ $TRAVIS_OS_NAME == osx ]; then chmod +x ./scripts/travis/build-macos.sh ; ./scripts/travis/build-macos.sh ; fi