Update Travis CI

KyleMayes · Nov 4, 2018 · 887b0d0 · 887b0d0
1 parent 95916c0
commit 887b0d0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,7 @@ rust: stable
 
 env:
   - LLVM_VERSION=3.5 CLANG_VERSION=clang_3_5
-  - LLVM_VERSION=5.0 CLANG_VERSION=clang_5_0
+  - LLVM_VERSION=7.0 CLANG_VERSION=clang_7_0
 
 cache:
   directories:

diff --git a/ci/before_install.sh b/ci/before_install.sh
@@ -6,14 +6,6 @@ if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
     rvm get head || true
 fi
 
-function llvm_linux_target_triple() {
-    if [ "$1" == "5.0" ]; then
-        echo "linux-x86_64-ubuntu14.04"
-    else
-        echo "x86_64-linux-gnu-ubuntu-14.04"
-    fi
-}
-
 function llvm_version_triple() {
     if [ "$1" == "3.5" ]; then
         echo "3.5.2"
@@ -28,7 +20,11 @@ function llvm_version_triple() {
     elif [ "$1" == "4.0" ]; then
         echo "4.0.1"
     elif [ "$1" == "5.0" ]; then
-        echo "5.0.0"
+        echo "5.0.2"
+    elif [ "$1" == "6.0" ]; then
+        echo "6.0.1"
+    elif [ "$1" == "7.0" ]; then
+        echo "7.0.0"
     fi
 }
 
@@ -49,7 +45,7 @@ function llvm_download() {
 }
 
 if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
-    llvm_download `llvm_linux_target_triple ${LLVM_VERSION}`
+    llvm_download x86_64-linux-gnu-ubuntu-14.04
     export LD_LIBRARY_PATH="${LLVM_DIRECTORY}/lib":$LD_LIBRARY_PATH
 else
     llvm_download x86_64-apple-darwin