aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-12-14 13:54:42 -0500
committerGennadiy Civil <misterg@google.com>2018-12-14 13:54:43 -0500
commitb5f5c596a9915106c1ac36a3f89db4e0e49c07d1 (patch)
tree2bc11702641f6bcca31032b4c343238d7b9178f6 /.travis.yml
parentc6cb7e033591528a5fe2c63157a0d8ce927740dc (diff)
parent31eb5e9b873af4b509be2f77616113007fa0de9d (diff)
downloadgoogletest-b5f5c596a9915106c1ac36a3f89db4e0e49c07d1.tar.gz
googletest-b5f5c596a9915106c1ac36a3f89db4e0e49c07d1.tar.bz2
googletest-b5f5c596a9915106c1ac36a3f89db4e0e49c07d1.zip
Merge pull request #2000 from ciband:feat/add_support_platformio
PiperOrigin-RevId: 225552792
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml26
1 files changed, 10 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml
index 8ea55db5..fd8f7c65 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,13 @@ language: cpp
matrix:
include:
- os: linux
+ dist: trusty
+ sudo: required
+ group: deprecated-2017Q3
+ before_install: chmod -R +x ./ci/*platformio.sh
+ install: ./ci/install-platformio.sh
+ script: ./ci/build-platformio.sh
+ - os: linux
compiler: gcc
sudo : true
install: ./ci/install-linux.sh && ./ci/log-config.sh
@@ -44,18 +51,6 @@ matrix:
env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11
if: type != pull_request
-before_install:
- - |
- if [ "$TRAVIS_OS_NAME" != "osx" ] && [ ! -f ${TRAVIS_BUILD_DIR}/apt-cache/pkgcache.bin ]; then
- mkdir -p ${TRAVIS_BUILD_DIR}/apt-cache/archives/partial
- mkdir -p ${TRAVIS_BUILD_DIR}/apt-cache/partial
- mkdir -p ${TRAVIS_BUILD_DIR}/apt-cache/lists
- sudo apt-get -y -o Dir::cache=${TRAVIS_BUILD_DIR}/apt-cache -o Dir::State::Lists=${TRAVIS_BUILD_DIR}/apt-cache/lists update
- sudo apt-get install --download-only -o Dir::cache=${TRAVIS_BUILD_DIR}/apt-cache -o Dir::State::Lists=${TRAVIS_BUILD_DIR}/apt-cache/lists g++-4.9 clang-3.9
- fi
- - if [ "$TRAVIS_OS_NAME" != "osx" ]; then sudo apt-get install --no-download -o Dir::cache=${TRAVIS_BUILD_DIR}/apt-cache -o Dir::State::Lists=${TRAVIS_BUILD_DIR}/apt-cache/lists g++-4.9 clang-3.9; fi
- - if [ "$TRAVIS_OS_NAME" != "osx" ]; then sudo chown -R $USER ${TRAVIS_BUILD_DIR}/apt-cache; fi
-
# These are the install and build (script) phases for the most common entries in the matrix. They could be included
# in each entry in the matrix, but that is just repetitive.
install:
@@ -75,10 +70,9 @@ addons:
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.9
-
-cache:
- directories:
- - apt-cache
+ packages:
+ - g++-4.9
+ - clang-3.9
notifications:
email: false