tqcq/leveldb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update Travis CI configuration.

Browse Source 
* Use Ubuntu 18.04 and LLVM 9 on Travis.
* Fix bash conditionals: [ a == b ] should be [ a = b ].

PiperOrigin-RevId: 271898719
This commit is contained in:
Victor Costan 2019-09-29 20:33:37 -07:00 committed by Victor Costan
parent 60db170a43
commit 45ee61579c
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.travis.yml
View File

@ -3,8 +3,8 @@
# This file can be validated on: http://lint.travis-ci.org/ # This file can be validated on: http://lint.travis-ci.org/
language: cpp language: cpp
dist: xenial dist: bionic
osx_image: xcode10.2 osx_image: xcode10.3
compiler: compiler:
- gcc - gcc
@ -20,10 +20,11 @@ env:
addons: addons:
apt: apt:
sources: sources:
- llvm-toolchain-xenial-8 - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main'
- ubuntu-toolchain-r-test key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
- sourceline: 'ppa:ubuntu-toolchain-r/test'
packages: packages:
- clang-8 - clang-9
- cmake - cmake
- gcc-9 - gcc-9
- g++-9 - g++-9
@ -38,8 +39,8 @@ addons:
- crc32c - crc32c
- gcc@9 - gcc@9
- gperftools - gperftools
- kyotocabinet - kyoto-cabinet
- llvm@8 - llvm@9
- ninja - ninja
- snappy - snappy
- sqlite3 - sqlite3
@ -48,7 +49,7 @@ addons:
install: install:
# The following Homebrew packages aren't linked by default, and need to be # The following Homebrew packages aren't linked by default, and need to be
# prepended to the path explicitly. # prepended to the path explicitly.
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
export PATH="$(brew --prefix llvm)/bin:$PATH"; export PATH="$(brew --prefix llvm)/bin:$PATH";
fi fi
# /usr/bin/gcc points to an older compiler on both Linux and macOS. # /usr/bin/gcc points to an older compiler on both Linux and macOS.
@ -58,8 +59,8 @@ install:
# Homebrew's llvm package doesn't ship a versioned clang++ binary, so the values # Homebrew's llvm package doesn't ship a versioned clang++ binary, so the values
# below don't work on macOS. Fortunately, the path change above makes the # below don't work on macOS. Fortunately, the path change above makes the
# default values (clang and clang++) resolve to the correct compiler on macOS. # default values (clang and clang++) resolve to the correct compiler on macOS.
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
if [ "$CXX" = "clang++" ]; then export CXX="clang++-8" CC="clang-8"; fi; if [ "$CXX" = "clang++" ]; then export CXX="clang++-9" CC="clang-9"; fi;
fi fi
- echo ${CC} - echo ${CC}
- echo ${CXX} - echo ${CXX}