From 6555424d8621dbeb8286883e0069bd5ad8440d03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 3 Sep 2019 11:13:22 +0200 Subject: [PATCH] package/ci: add a static macOS build as well. --- package/ci/travis.yml | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/package/ci/travis.yml b/package/ci/travis.yml index 670ea88..8e2b3d4 100644 --- a/package/ci/travis.yml +++ b/package/ci/travis.yml @@ -18,17 +18,6 @@ matrix: env: - JOBID=linux-gl - TARGET=desktop - - BUILD_STATIC=OFF - - LCOV_EXTRA_OPTS="--gcov-tool /usr/bin/gcov-4.8" - - language: python - python: 3.6 - os: linux - dist: xenial - compiler: gcc - env: - - JOBID=linux-gl-static - - TARGET=desktop - - BUILD_STATIC=ON - LCOV_EXTRA_OPTS="--gcov-tool /usr/bin/gcov-4.8" - language: python python: 3.6 @@ -68,13 +57,29 @@ matrix: - lcov - libsdl2-dev - libglfw3-dev + - language: python + python: 3.6 + os: linux + dist: xenial + compiler: gcc + env: + - JOBID=linux-static + - TARGET=desktop + - BUILD_STATIC=ON + - LCOV_EXTRA_OPTS="--gcov-tool /usr/bin/gcov-4.8" - language: cpp os: osx compiler: clang env: - JOBID=macos-gl - TARGET=desktop - - BUILD_STATIC=OFF + - language: cpp + os: osx + compiler: clang + env: + - JOBID=macos-static + - TARGET=desktop + - BUILD_STATIC=ON notifications: webhooks: @@ -92,6 +97,7 @@ cache: install: - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export CXX=g++-4.8; fi +- if [ "$BUILD_STATIC" != "ON" ]; then export BUILD_STATIC=OFF; fi - if [ "$TRAVIS_OS_NAME" == "linux" ] && ( [ "$TARGET" == "desktop" ] || [ "$TARGET" == "desktop-sanitizers" ] ); then export PLATFORM_GL_API=GLX; fi - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$TARGET" == "desktop-gles" ]; then export PLATFORM_GL_API=EGL; fi # Download CMake 3.1.3 to ensure we're still compatible with it (Travis has