Skip to content

GitLab

Commit 80340011 authored by Gennadiy Civil's avatar Gennadiy Civil
Browse files

Merge branch 'master' of https://github.com/google/googletest

parents 2f31bfab 6eccdb7b
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
.travis.yml
View file @ 80340011
...@@ -11,28 +11,34 @@ language: cpp ...@@ -11,28 +11,34 @@ language: cpp
matrix: matrix:
include: include:
- os: linux - os: linux
group: deprecated-2017Q4
compiler: gcc compiler: gcc
sudo: true sudo: true
cache: cache:
install: ./ci/install-linux.sh && ./ci/log-config.sh install: ./ci/install-linux.sh && ./ci/log-config.sh
script: ./ci/build-linux-bazel.sh script: ./ci/build-linux-bazel.sh
- os: linux - os: linux
group: deprecated-2017Q4
compiler: clang compiler: clang
sudo: true sudo: true
cache: cache:
install: ./ci/install-linux.sh && ./ci/log-config.sh install: ./ci/install-linux.sh && ./ci/log-config.sh
script: ./ci/build-linux-bazel.sh script: ./ci/build-linux-bazel.sh
- os: linux - os: linux
group: deprecated-2017Q4
compiler: gcc compiler: gcc
install: ./ci/install-linux.sh && ./ci/log-config.sh install: ./ci/install-linux.sh && ./ci/log-config.sh
script: ./ci/build-linux-autotools.sh script: ./ci/build-linux-autotools.sh
- os: linux - os: linux
group: deprecated-2017Q4
compiler: gcc compiler: gcc
env: BUILD_TYPE=Debug VERBOSE=1 CXX_FLAGS=-std=c++11 env: BUILD_TYPE=Debug VERBOSE=1 CXX_FLAGS=-std=c++11
- os: linux - os: linux
group: deprecated-2017Q4
compiler: clang compiler: clang
env: BUILD_TYPE=Debug VERBOSE=1 env: BUILD_TYPE=Debug VERBOSE=1
- os: linux - os: linux
group: deprecated-2017Q4
compiler: clang compiler: clang
env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11
- os: osx - os: osx
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment