Skip to content

Commit

Permalink
Experiment a bit more with Travis.
Browse files Browse the repository at this point in the history
It's hanging for some reason on OSX build of spirv-tools.
  • Loading branch information
HansKristian-Work committed Mar 12, 2018
1 parent 5a746ba commit 1a4a36b
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ before_script:
- ./checkout_glslang_spirv_tools.sh

script:
- ./build_glslang_spirv_tools.sh
- ./build_glslang_spirv_tools.sh Release 2
- make -j2
- ./test_shaders.sh
18 changes: 14 additions & 4 deletions build_glslang_spirv_tools.sh
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
#!/bin/bash

PROFILE=Release
if [ ! -z $1 ]; then
PROFILE=$1
fi

NPROC=$(nproc)
if [ ! -z $2 ]; then
NPROC=$2
fi

echo "Building glslang."
mkdir -p external/glslang-build
cd external/glslang-build
cmake ../glslang -DCMAKE_BUILD_TYPE=Release -G"Unix Makefiles"
make -j$(nproc)
cmake ../glslang -DCMAKE_BUILD_TYPE=$PROFILE -G"Unix Makefiles"
make -j$NPROC
cd ../..

echo "Building SPIRV-Tools."
mkdir -p external/spirv-tools-build
cd external/spirv-tools-build
cmake ../spirv-tools -DCMAKE_BUILD_TYPE=Release -G"Unix Makefiles"
make -j$(nproc)
cmake ../spirv-tools -DCMAKE_BUILD_TYPE=$PROFILE -G"Unix Makefiles"
make -j$NPROC
cd ../..

0 comments on commit 1a4a36b

Please sign in to comment.