From 515ed25a48fbd340f8b561affc3227bcb5d09770 Mon Sep 17 00:00:00 2001 From: Elliott Slaughter Date: Mon, 20 Nov 2023 20:51:54 -0800 Subject: [PATCH] Upgrade to LLVM 17.0.5. --- .github/workflows/main.yml | 6 +++--- travis.sh | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a7eed435..33e0b46f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -93,7 +93,7 @@ jobs: strategy: matrix: distro: ['ubuntu-18.04'] - llvm: ['11', '12.0.1', '13.0.1', '14.0.6', '15.0.2', '16.0.3', '17.0.1'] + llvm: ['11', '12.0.1', '13.0.1', '14.0.6', '15.0.2', '16.0.3', '17.0.5'] lua: ['luajit', 'moonjit'] cuda: ['0', '1'] test: ['1'] @@ -109,7 +109,7 @@ jobs: cuda: '1' - llvm: '16.0.3' cuda: '1' - - llvm: '17.0.1' + - llvm: '17.0.5' cuda: '1' # Moonjit with LLVM 14 only: @@ -123,7 +123,7 @@ jobs: lua: 'moonjit' - llvm: '16.0.3' lua: 'moonjit' - - llvm: '17.0.1' + - llvm: '17.0.5' lua: 'moonjit' include: diff --git a/travis.sh b/travis.sh index a1426300..1f3704f2 100755 --- a/travis.sh +++ b/travis.sh @@ -34,11 +34,11 @@ if [[ $(uname) = Linux ]]; then elif [[ $(uname) = Darwin ]]; then if [[ $LLVM_VERSION = 17 ]]; then - curl -L -O https://github.com/terralang/llvm-build/releases/download/llvm-17.0.1/clang+llvm-17.0.1-x86_64-apple-darwin.tar.xz - tar xf clang+llvm-17.0.1-x86_64-apple-darwin.tar.xz - ln -s clang+llvm-17.0.1-x86_64-apple-darwin/bin/llvm-config llvm-config-17 - ln -s clang+llvm-17.0.1-x86_64-apple-darwin/bin/clang clang-17 - export CMAKE_PREFIX_PATH=$PWD/clang+llvm-17.0.1-x86_64-apple-darwin + curl -L -O https://github.com/terralang/llvm-build/releases/download/llvm-17.0.5/clang+llvm-17.0.5-x86_64-apple-darwin.tar.xz + tar xf clang+llvm-17.0.5-x86_64-apple-darwin.tar.xz + ln -s clang+llvm-17.0.5-x86_64-apple-darwin/bin/llvm-config llvm-config-17 + ln -s clang+llvm-17.0.5-x86_64-apple-darwin/bin/clang clang-17 + export CMAKE_PREFIX_PATH=$PWD/clang+llvm-17.0.5-x86_64-apple-darwin elif [[ $LLVM_VERSION = 16 ]]; then curl -L -O https://github.com/terralang/llvm-build/releases/download/llvm-16.0.3/clang+llvm-16.0.3-x86_64-apple-darwin.tar.xz tar xf clang+llvm-16.0.3-x86_64-apple-darwin.tar.xz