Browse Source

package/ci: use our own compiled SwiftShader.

It doesn't build on GCC 4.8 anymore (had to use GCC 5), so I bet things
will catch fire now.
pull/470/head
Vladimír Vondruš 6 years ago
parent
commit
2e7de5248c
  1. 8
      package/ci/travis-desktop-gles.sh
  2. 10
      package/ci/travis.yml

8
package/ci/travis-desktop-gles.sh

@ -21,10 +21,10 @@ cmake .. \
-DCMAKE_PREFIX_PATH="$HOME/deps" \ -DCMAKE_PREFIX_PATH="$HOME/deps" \
-DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_INSTALL_PREFIX=$HOME/deps \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \
-DEGL_LIBRARY=$HOME/swiftshader/libEGL.so \ -DEGL_LIBRARY=$HOME/swiftshader/lib/libEGL.so \
-DOPENGLES2_LIBRARY=$HOME/swiftshader/libGLESv2.so \ -DOPENGLES2_LIBRARY=$HOME/swiftshader/lib/libGLESv2.so \
-DOPENGLES3_LIBRARY=$HOME/swiftshader/libGLESv2.so \ -DOPENGLES3_LIBRARY=$HOME/swiftshader/lib/libGLESv2.so \
-DCMAKE_INSTALL_RPATH=$HOME/swiftshader \ -DCMAKE_INSTALL_RPATH=$HOME/swiftshader/lib \
-DTARGET_GLES=ON \ -DTARGET_GLES=ON \
-DTARGET_GLES2=$TARGET_GLES2 \ -DTARGET_GLES2=$TARGET_GLES2 \
-DWITH_AUDIO=ON \ -DWITH_AUDIO=ON \

10
package/ci/travis.yml

@ -228,8 +228,6 @@ notifications:
cache: cache:
directories: directories:
- $HOME/sdl2 - $HOME/sdl2
- $HOME/swiftshader
- $HOME/cmake
install: install:
- if [ "$TRAVIS_OS_NAME" == "linux" ] && [ ! "$TARGET" == "desktop-sanitizers" ] && [ ! "$TARGET" == "android" ] && [ ! "$TARGET" == "desktop-vulkan" ]; then export CXX=g++-4.8; fi - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ ! "$TARGET" == "desktop-sanitizers" ] && [ ! "$TARGET" == "android" ] && [ ! "$TARGET" == "desktop-vulkan" ]; then export CXX=g++-4.8; fi
@ -266,9 +264,11 @@ install:
# GLFW (cached) # GLFW (cached)
- if [ "$TRAVIS_OS_NAME" == "osx" ] && ( [ "$TARGET" == "desktop" ] || [ "$TARGET" == "desktop-vulkan" ] ); then HOMEBREW_NO_AUTO_UPDATE=1 brew install glfw; fi - if [ "$TRAVIS_OS_NAME" == "osx" ] && ( [ "$TARGET" == "desktop" ] || [ "$TARGET" == "desktop-vulkan" ] ); then HOMEBREW_NO_AUTO_UPDATE=1 brew install glfw; fi
# SwiftShader on Linux (cached). Taken from Chromium snapshot 587878 # SwiftShader on Linux GLES (16.04). Zip from
# (swiftshader-bin Arch package). # https://github.com/mosra/magnum-ci/tree/swiftshader and self-hosted because
- if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$TARGET" == "desktop-gles" ] && [ ! -e "$HOME/swiftshader/libEGL.so" ]; then cd $HOME ; wget https://ci.magnum.graphics/swiftshader-chromium-587878.tar.gz && mkdir -p swiftshader && cd swiftshader && tar -xzf ../swiftshader-chromium-587878.tar.gz && cd $TRAVIS_BUILD_DIR ; fi # GH Actions would make it too simple for people if you could just download the
# artifacts directly, right? RIGHT?
- if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$TARGET" == "desktop-gles" ] && [ ! -e "$HOME/swiftshader/lib/libGLESv2.so" ]; then cd $HOME ; wget https://ci.magnum.graphics/swiftshader-gles-r5464.a6940c8e6e-ubuntu-16.04.zip && mkdir -p swiftshader && cd swiftshader && unzip ../swiftshader-gles-r5464.a6940c8e6e-ubuntu-16.04.zip && cd $TRAVIS_BUILD_DIR ; fi
script: script:
- if [ "$TRAVIS_OS_NAME" == "linux" ] && ( [ "$TARGET" == "desktop" ] || [ "$TARGET" == "desktop-sanitizers" ] ); then ./package/ci/travis-desktop.sh; fi - if [ "$TRAVIS_OS_NAME" == "linux" ] && ( [ "$TARGET" == "desktop" ] || [ "$TARGET" == "desktop-sanitizers" ] ); then ./package/ci/travis-desktop.sh; fi

Loading…
Cancel
Save