Skip to content

Commit 4d62009

Browse files
committed
Enable Travis CI for llvm_release_70 branch
For some reason find_package(LLVM) in travis environment (Ubuntu 16.04 Xenial + Cmake 3.12) find clang-tools-7 package instead of llvm-7-tools! So I added -DCMAKE_PREFIX_PATH to work it around.
1 parent 5474bb2 commit 4d62009

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

.travis.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ git:
1313
branches:
1414
only:
1515
- master
16+
- llvm_release_70
1617

1718
addons:
1819
apt:
1920
sources:
20-
- sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial main'
21-
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
21+
- llvm-toolchain-xenial-7
2222
- ubuntu-toolchain-r-test
2323
packages:
2424
- llvm-7-tools
@@ -69,8 +69,8 @@ script:
6969
if [ $BUILD_EXTERNAL == "0" ]; then
7070
mkdir llvm-spirv
7171
mv * llvm-spirv
72-
git clone https://git.llvm.org/git/llvm.git/ --depth 1
73-
mv llvm-spirv llvm/tools/llvm-spirv
72+
git clone https://git.llvm.org/git/llvm.git/ --depth 1 -b release_70
73+
mv llvm-spirv llvm/projects/llvm-spirv
7474
fi
7575
- mkdir build && cd build
7676
- |
@@ -81,6 +81,7 @@ script:
8181
-DBUILD_SHARED_LIBS=${SHARED_LIBS} \
8282
-DLLVM_BUILD_TOOLS=ON \
8383
-DLLVM_EXTERNAL_LIT="/usr/lib/llvm-7/build/utils/lit/lit.py" \
84+
-DCMAKE_PREFIX_PATH="/usr/lib/llvm-7/" \
8485
-DLLVM_INCLUDE_TESTS=ON \
8586
-DCMAKE_INSTALL_PREFIX=../install/ \
8687
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \

0 commit comments

Comments
 (0)