From 955eac522b552694e9b4eea163dc27c390e7a181 Mon Sep 17 00:00:00 2001 From: Hans-Kristian Arntzen Date: Mon, 12 Mar 2018 15:15:06 +0100 Subject: [PATCH] Make use of the handy scripts for Travis as well. --- .travis.yml | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 26941f4..f60a94c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,24 +10,12 @@ dist: trusty # We check out glslang and SPIRV-Tools at specific revisions to avoid test output mismatches env: - - GLSLANG_REV=9c6f8cc29ba303b43ccf36deea6bb38a304f9b92 SPIRV_TOOLS_REV=e28edd458b729da7bbfd51e375feb33103709e6f + - PROFILE=plain before_script: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade python3; fi - - git clone https://github.com/KhronosGroup/glslang.git glslang - - git clone https://github.com/KhronosGroup/SPIRV-Tools SPIRV-Tools - - git clone https://github.com/KhronosGroup/SPIRV-Headers.git SPIRV-Tools/external/spirv-headers + - ./checkout_glslang_spirv_tools.sh script: - - git -C glslang checkout $GLSLANG_REV - - git -C SPIRV-Tools checkout $SPIRV_TOOLS_REV - - cd glslang && cmake . && make -j2 && cd .. - - cd SPIRV-Tools && cmake . && make -j2 && cd .. - make -j2 - - PATH=./glslang/StandAlone:./SPIRV-Tools/tools:$PATH - - ./test_shaders.py shaders - - ./test_shaders.py --msl shaders-msl - - ./test_shaders.py --hlsl shaders-hlsl - - ./test_shaders.py shaders --opt - - ./test_shaders.py --msl shaders-msl --opt - - ./test_shaders.py --hlsl shaders-hlsl --opt + - ./test_shaders.sh