Skip to content

Commit f10cecc

Browse files
committed
Update .travis.xml
1 parent 1492986 commit f10cecc

File tree

1 file changed

+17
-14
lines changed

1 file changed

+17
-14
lines changed

.travis.yml

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,36 @@ git:
1212
branches:
1313
only:
1414
- master
15+
- ocl-open-110
1516

1617
env:
17-
global:
18-
- LLVM_VERSION=11
1918
matrix:
2019
- BUILD_TYPE=Release
2120
- BUILD_TYPE=Debug
2221

23-
before_install:
24-
- curl -L "https://apt.llvm.org/llvm-snapshot.gpg.key" | sudo apt-key add -
25-
- echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic main" | sudo tee -a ${TRAVIS_ROOT}/etc/apt/sources.list
26-
- sudo apt-get update
27-
- sudo apt-get -yq --no-install-suggests --no-install-recommends install
28-
llvm-${LLVM_VERSION}-dev
29-
llvm-${LLVM_VERSION}-tools
30-
libclang-${LLVM_VERSION}-dev
31-
libclang-cpp${LLVM_VERSION}-dev
22+
addons:
23+
apt:
24+
sources:
25+
- sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main'
26+
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
27+
- ubuntu-toolchain-r-test
28+
packages:
29+
llvm-11-dev
30+
llvm-11-tools
31+
libclang-11-dev
3232

3333
install:
34-
- wget https://github.com/KhronosGroup/SPIRV-LLVM-Translator/releases/download/dev-build/SPIRV-LLVM-Translator-dev-build-linux-Release.zip -O /tmp/SPIRV-LLVM-Translator-dev-build-linux-${BUILD_TYPE}.zip
35-
- unzip /tmp/SPIRV-LLVM-Translator-dev-build-linux-${BUILD_TYPE}.zip -d spirv-llvm-translator
34+
- git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator.git spirv-llvm-translator
35+
- mkdir spirv-llvm-translator/build && cd spirv-llvm-translator/build
36+
- cmake .. -DCMAKE_INSTALL_PREFIX=./install -DBUILD_SHARED_LIBS=ON -DLLVM_BUILD_TOOLS=ON -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
37+
- make -j`nproc` && make install
38+
- cd ../../
3639

3740
compiler:
3841
- gcc
3942
- clang
4043

4144
script:
4245
- mkdir build && cd build
43-
- cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DLLVM_NO_DEAD_STRIP=ON -DLLVMSPIRV_INCLUDED_IN_LLVM=OFF -DSPIRV_TRANSLATOR_DIR=./spirv-llvm-translator -DCMAKE_INSTALL_PREFIX=./install ..
46+
- cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DLLVM_NO_DEAD_STRIP=ON -DLLVMSPIRV_INCLUDED_IN_LLVM=OFF -DSPIRV_TRANSLATOR_DIR=${TRAVIS_BUILD_DIR}/spirv-llvm-translator/build/install -DCMAKE_INSTALL_PREFIX=./install ..
4447
- make install

0 commit comments

Comments
 (0)