Merge branch 'master' of https://github.com/google/googletest
This commit is contained in:
		@@ -11,28 +11,34 @@ language: cpp
 | 
			
		||||
matrix:
 | 
			
		||||
  include:
 | 
			
		||||
    - os: linux
 | 
			
		||||
      group: deprecated-2017Q4
 | 
			
		||||
      compiler: gcc
 | 
			
		||||
      sudo: true
 | 
			
		||||
      cache:
 | 
			
		||||
      install: ./ci/install-linux.sh && ./ci/log-config.sh
 | 
			
		||||
      script: ./ci/build-linux-bazel.sh
 | 
			
		||||
    - os: linux
 | 
			
		||||
      group: deprecated-2017Q4
 | 
			
		||||
      compiler: clang
 | 
			
		||||
      sudo: true
 | 
			
		||||
      cache:
 | 
			
		||||
      install: ./ci/install-linux.sh && ./ci/log-config.sh
 | 
			
		||||
      script: ./ci/build-linux-bazel.sh
 | 
			
		||||
    - os: linux
 | 
			
		||||
      group: deprecated-2017Q4
 | 
			
		||||
      compiler: gcc
 | 
			
		||||
      install: ./ci/install-linux.sh && ./ci/log-config.sh
 | 
			
		||||
      script: ./ci/build-linux-autotools.sh
 | 
			
		||||
    - os: linux
 | 
			
		||||
      group: deprecated-2017Q4
 | 
			
		||||
      compiler: gcc
 | 
			
		||||
      env: BUILD_TYPE=Debug VERBOSE=1 CXX_FLAGS=-std=c++11
 | 
			
		||||
    - os: linux
 | 
			
		||||
      group: deprecated-2017Q4
 | 
			
		||||
      compiler: clang
 | 
			
		||||
      env: BUILD_TYPE=Debug VERBOSE=1
 | 
			
		||||
    - os: linux
 | 
			
		||||
      group: deprecated-2017Q4
 | 
			
		||||
      compiler: clang
 | 
			
		||||
      env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11
 | 
			
		||||
    - os: osx
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user