diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-07-15 19:51:46 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-07-15 19:51:46 (GMT) |
| commit | 01573aa0e85197d6ee4c6666135ba9d0102f42df (patch) | |
| tree | 6e78ea006502412d1532c9585bc82c993e499f51 | |
| parent | 31ff59788846d173aba856d143aebf4b68ea4602 (diff) | |
| parent | afa914325696789fc633fa2aa85bb8328c712a5d (diff) | |
| download | googletest-01573aa0e85197d6ee4c6666135ba9d0102f42df.zip googletest-01573aa0e85197d6ee4c6666135ba9d0102f42df.tar.gz googletest-01573aa0e85197d6ee4c6666135ba9d0102f42df.tar.bz2 | |
Merge branch 'master' of github.com:google/googletest
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index db199c8..c3e94e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ # This file can be validated on: # http://lint.travis-ci.org/ -sudo: false language: cpp # Define the matrix explicitly, manually expanding the combinations of (os, compiler, env). @@ -11,20 +10,17 @@ language: cpp matrix: include: - os: linux - sudo: required before_install: chmod -R +x ./ci/*platformio.sh install: ./ci/install-platformio.sh script: ./ci/build-platformio.sh - os: linux dist: xenial compiler: gcc - sudo : true install: ./ci/install-linux.sh && ./ci/log-config.sh script: ./ci/build-linux-bazel.sh - os: linux dist: xenial compiler: clang - sudo : true install: ./ci/install-linux.sh && ./ci/log-config.sh script: ./ci/build-linux-bazel.sh - os: linux @@ -52,7 +48,7 @@ install: script: ./ci/travis.sh -# For sudo=false builds this section installs the necessary dependencies. +# This section installs the necessary dependencies. addons: apt: # List of whitelisted in travis packages for ubuntu-precise can be found here: |