Browse Source

package/ci: build also SDL2 and GLFW apps on Travis.

Why that was not done?
appveyor-coverage
Vladimír Vondruš 7 years ago
parent
commit
232b559984
  1. 6
      package/ci/travis-desktop.sh
  2. 13
      package/ci/travis.yml

6
package/ci/travis-desktop.sh

@ -18,7 +18,8 @@ cmake .. \
ninja install ninja install
cd ../.. cd ../..
# Magnum # Magnum. Keep the WindowlessApplication disabled as otherwise it would
# attempt to run GL tests. We don't want that.
git clone --depth 1 git://github.com/mosra/magnum.git git clone --depth 1 git://github.com/mosra/magnum.git
cd magnum cd magnum
mkdir build && cd build mkdir build && cd build
@ -39,6 +40,9 @@ cmake .. \
-DWITH_TEXTURETOOLS=OFF \ -DWITH_TEXTURETOOLS=OFF \
-DWITH_TRADE=ON \ -DWITH_TRADE=ON \
-DWITH_VK=OFF \ -DWITH_VK=OFF \
-DWITH_GLFWAPPLICATION=ON \
-DWITH_SDL2APPLICATION=ON \
-DWITH_WINDOWLESS${PLATFORM_GL_API}APPLICATION=OFF \
-G Ninja -G Ninja
ninja install ninja install
cd ../.. cd ../..

13
package/ci/travis.yml

@ -5,6 +5,8 @@ addons:
- libgl1-mesa-dev - libgl1-mesa-dev
- ninja-build - ninja-build
- lcov - lcov
- libsdl2-dev
- libglfw3-dev
matrix: matrix:
include: include:
@ -45,7 +47,8 @@ matrix:
- g++-4.8 - g++-4.8
- ninja-build - ninja-build
- lcov - lcov
- libgles2-mesa-dev - libsdl2-dev
- libglfw3-dev
- language: python - language: python
python: 3.6 python: 3.6
os: linux os: linux
@ -63,7 +66,8 @@ matrix:
- g++-4.8 - g++-4.8
- ninja-build - ninja-build
- lcov - lcov
- libgles2-mesa-dev - libsdl2-dev
- libglfw3-dev
- language: cpp - language: cpp
os: osx os: osx
compiler: clang compiler: clang
@ -88,6 +92,8 @@ cache:
install: install:
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then export CXX=g++-4.8; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export CXX=g++-4.8; 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 # Download CMake 3.1.3 to ensure we're still compatible with it (Travis has
# 3.9 since December 2017). Also, the PATH setting can't be cached, so it's # 3.9 since December 2017). Also, the PATH setting can't be cached, so it's
# separate (bit me two times already). Android needs CMake 3.7, but # separate (bit me two times already). Android needs CMake 3.7, but
@ -105,6 +111,9 @@ install:
- if [ "$TRAVIS_OS_NAME" == "linux" ] && [ ! -e "$HOME/pybind11/bin" ]; then $TRAVIS_BUILD_DIR/package/ci/setup-pybind11.sh; fi - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ ! -e "$HOME/pybind11/bin" ]; then $TRAVIS_BUILD_DIR/package/ci/setup-pybind11.sh; fi
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install pybind11; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install pybind11; fi
# SDL and GLFW on macOS
- if [ "$TRAVIS_OS_NAME" == "osx" ] && [ "$TARGET" == "desktop" ]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install sdl2 glfw; fi
# numpy on macOS -- probably because we updated Homebrew to install new pybind # numpy on macOS -- probably because we updated Homebrew to install new pybind
# (and thus python as well, apparently), the preinstalled numpy is no longer # (and thus python as well, apparently), the preinstalled numpy is no longer
# visible. # visible.

Loading…
Cancel
Save