Skip to content

GitLab

Unverified Commit 7888184f authored by Gennadiy Civil's avatar Gennadiy Civil Committed by GitHub
Browse files

Include OSX builds back into PR builds 

Had an instance where the breakage was not detected until the actual merge. Need to be better than that
parent 86d14079
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
.travis.yml
View file @ 7888184f
...@@ -40,7 +40,6 @@ matrix: ...@@ -40,7 +40,6 @@ matrix:
- os: osx - os: osx
compiler: gcc compiler: gcc
env: BUILD_TYPE=Debug VERBOSE=1 env: BUILD_TYPE=Debug VERBOSE=1
if: type != pull_request
- os: osx - os: osx
compiler: gcc compiler: gcc
env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11
...@@ -50,7 +49,6 @@ matrix: ...@@ -50,7 +49,6 @@ matrix:
env: BUILD_TYPE=Debug VERBOSE=1 env: BUILD_TYPE=Debug VERBOSE=1
if: type != pull_request if: type != pull_request
- os: osx - os: osx
compiler: clang
env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11
if: type != pull_request if: type != pull_request
......
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