Skip to content
Snippets Groups Projects
Commit e9810216 authored by Emmanuel Gil Peyrot's avatar Emmanuel Gil Peyrot
Browse files

Fix -Werror in Travis, env gets overriden

Prevents #1197 from happening again.
parent f5d39545
No related branches found
No related tags found
No related merge requests found
...@@ -14,15 +14,16 @@ addons: ...@@ -14,15 +14,16 @@ addons:
- libxinerama-dev - libxinerama-dev
- libxcursor-dev - libxcursor-dev
- libxi-dev - libxi-dev
env:
global:
- CFLAGS=-Werror
matrix: matrix:
include: include:
- os: linux - os: linux
env: BUILD_SHARED_LIBS=ON env:
- BUILD_SHARED_LIBS=ON
- CFLAGS=-Werror
- os: linux - os: linux
env: BUILD_SHARED_LIBS=OFF env:
- BUILD_SHARED_LIBS=OFF
- CFLAGS=-Werror
- os: linux - os: linux
sudo: required sudo: required
addons: addons:
...@@ -34,6 +35,7 @@ matrix: ...@@ -34,6 +35,7 @@ matrix:
env: env:
- USE_WAYLAND=ON - USE_WAYLAND=ON
- BUILD_SHARED_LIBS=ON - BUILD_SHARED_LIBS=ON
- CFLAGS=-Werror
- os: linux - os: linux
sudo: required sudo: required
addons: addons:
...@@ -45,10 +47,15 @@ matrix: ...@@ -45,10 +47,15 @@ matrix:
env: env:
- USE_WAYLAND=ON - USE_WAYLAND=ON
- BUILD_SHARED_LIBS=OFF - BUILD_SHARED_LIBS=OFF
- CFLAGS=-Werror
- os: osx - os: osx
env: BUILD_SHARED_LIBS=ON env:
- BUILD_SHARED_LIBS=ON
- CFLAGS=-Werror
- os: osx - os: osx
env: BUILD_SHARED_LIBS=OFF env:
- BUILD_SHARED_LIBS=OFF
- CFLAGS=-Werror
script: script:
- if grep -Inr '\s$' src include docs tests examples CMake *.md .gitattributes .gitignore; then echo Trailing whitespace found, aborting.; exit 1; fi - if grep -Inr '\s$' src include docs tests examples CMake *.md .gitattributes .gitignore; then echo Trailing whitespace found, aborting.; exit 1; fi
- mkdir build - mkdir build
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment