diff options
| author | alan-baker <alanbaker@google.com> | 2019-12-10 16:39:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-10 16:39:57 -0500 |
| commit | 26cd808a35229a7a77f6932698d3d07ac863aee3 (patch) | |
| tree | 965c60fdfec797074b7f4a57db022e56735ca892 /kokoro | |
| parent | 6875fe8cbd530bb19e18973b8a1c06a18df833ba (diff) | |
| download | amber-26cd808a35229a7a77f6932698d3d07ac863aee3.tar.gz | |
Don't checkout clspv and dxc deps by default (#749)
Fixes #707
* Add new arguments to git-sync-deps to control whether dxc, clspv and swiftshader
are checked out
* Update linux build to be able to sync extra deps
Diffstat (limited to 'kokoro')
| -rw-r--r-- | kokoro/linux-gcc-release-clspv/build.sh | 2 | ||||
| -rw-r--r-- | kokoro/scripts/linux/build.sh | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/kokoro/linux-gcc-release-clspv/build.sh b/kokoro/linux-gcc-release-clspv/build.sh index fde60fb..8e97c5e 100644 --- a/kokoro/linux-gcc-release-clspv/build.sh +++ b/kokoro/linux-gcc-release-clspv/build.sh @@ -17,4 +17,4 @@ set -e # fail on error set -x # display commands SCRIPT_DIR=`dirname "$BASH_SOURCE"` -source $SCRIPT_DIR/../scripts/linux/build.sh RELEASE gcc -DAMBER_USE_CLSPV=ON +source $SCRIPT_DIR/../scripts/linux/build.sh RELEASE gcc -DAMBER_USE_CLSPV=TRUE diff --git a/kokoro/scripts/linux/build.sh b/kokoro/scripts/linux/build.sh index 44218f3..a9695fd 100644 --- a/kokoro/scripts/linux/build.sh +++ b/kokoro/scripts/linux/build.sh @@ -61,8 +61,15 @@ wget -q https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linu unzip -q ninja-linux.zip export PATH="$PWD:$PATH" +DEPS_ARGS= +if [[ "$EXTRA_CONFIG" =~ "USE_CLSPV=TRUE" ]]; then + DEPS_ARGS="--with-clspv" +elif [[ "$EXTRA_CONFIG" =~ "USE_DXC=TRUE" ]]; then + DEPS_ARGS="--use-dxc" +fi + cd $SRC -./tools/git-sync-deps +./tools/git-sync-deps $DEPS_ARGS mkdir build && cd $SRC/build |