Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-26 03:52:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix -Werror in Travis, env gets overriden

Browse Source 
Prevents #1197 from happening again.
This commit is contained in:
Emmanuel Gil Peyrot 2018-01-30 16:37:45 +01:00 committed by linkmauve
parent f5d3954568
commit e98102162f
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.travis.yml
View File

@ -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:
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:
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