Skip to content

Commit 5a633b8

Browse files
committed
Revert CI to latest MacOS and Linux after the fix for LLVM >= 16
1 parent e68c127 commit 5a633b8

File tree

2 files changed

+16
-22
lines changed

2 files changed

+16
-22
lines changed

.github/workflows/test-linux.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ jobs:
1919
version:
2020
- '1.10'
2121
os:
22-
# - ubuntu-latest
23-
- ubuntu-22.04
22+
- ubuntu-latest
2423
# - macOS-latest
2524
arch:
2625
- x64
@@ -31,9 +30,9 @@ jobs:
3130
- name: Install libclang
3231
run: |
3332
if [ "$RUNNER_OS" = Linux ]; then
34-
sudo apt-get install clang-13 libclang-13-dev
33+
sudo apt-get install clang-19 libclang-19-dev
3534
else #MacOS
36-
brew install llvm@13
35+
brew install llvm@19
3736
fi
3837
- uses: julia-actions/setup-julia@latest
3938
with:
@@ -49,10 +48,13 @@ jobs:
4948
rm -f /opt/hostedtoolcache/julia/1.6*/x64/lib/julia/libstdc++.so.6
5049
fi
5150
if [ "$RUNNER_OS" = Linux ]; then
52-
cmake -DClang_DIR=/usr/lib/llvm-13/lib/cmake/clang -B build -S .
53-
else #MacOS
54-
cmake -DClang_DIR=/usr/local/Cellar/llvm@13/13.0.1_2/lib/cmake/clang/ -B build -S .
51+
cmake -DClang_DIR=/usr/lib/llvm-13/lib/cmake/clang -DCMAKE_INSTALL_PREFIX="$PWD" -B build -S .
52+
cmake --build build --verbose -j `nproc`
53+
else
54+
cmake -DClang_DIR=/opt/homebrew/opt/llvm@13/lib/cmake/clang -B build -S .
55+
cmake --build build --verbose -j `sysctl -n hw.logicalcpu`
5556
fi
56-
cmake --build build --verbose -j `nproc`
57-
PATH="`pwd`/build:$PATH"
57+
cmake --install build
58+
PATH="$PATH:$PWD/bin"
59+
export SDKROOT="$(xcrun --sdk macosx --show-sdk-path)"
5860
cd test && ./runtests.jl

.github/workflows/test-macos.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ jobs:
2020
- '1.10'
2121
os:
2222
# - ubuntu-latest
23-
# - macOS-latest
24-
- macos-13
23+
- macOS-latest
2524
arch:
2625
- x64
2726
steps:
@@ -31,16 +30,9 @@ jobs:
3130
- name: Install libclang
3231
run: |
3332
if [ "$RUNNER_OS" = Linux ]; then
34-
sudo apt-get install clang-13 libclang-13-dev
35-
#else #MacOS
36-
# #brew install llvm@13 #llvm@13 no more supported by brew
37-
# wget "https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-13.0.1.tar.gz"
38-
# tar xzf llvmorg-13.0.1.tar.gz
39-
# rm llvmorg-13.0.1.tar.gz
40-
# export CMAKE_INSTALL_MODE=SYMLINK #use symlinks to reduce disk space usage
41-
# cmake -S llvm-project-llvmorg-13.0.1/llvm -B llvm-build -DCMAKE_INSTALL_PREFIX=`pwd`/clang-13 -DLLVM_ENABLE_PROJECTS="clang" -DBUILD_SHARED_LIBS=on -DLLVM_BUILD_LLVM_DYLIB=on -DCMAKE_BUILD_TYPE=Release
42-
# cmake --build llvm-build --verbose -j `sysctl -n hw.logicalcpu`
43-
# cmake --install llvm-build
33+
sudo apt-get install clang-19 libclang-19-dev
34+
else #MacOS
35+
brew install llvm@19
4436
fi
4537
- uses: julia-actions/setup-julia@latest
4638
with:
@@ -59,7 +51,7 @@ jobs:
5951
cmake -DClang_DIR=/usr/lib/llvm-13/lib/cmake/clang -DCMAKE_INSTALL_PREFIX="$PWD" -B build -S .
6052
cmake --build build --verbose -j `nproc`
6153
else
62-
cmake -DBUILD_LLVM=ON -DCMAKE_INSTALL_PREFIX="$PWD" -B build -S .
54+
cmake -DClang_DIR=/opt/homebrew/opt/llvm@13/lib/cmake/clang -B build -S .
6355
cmake --build build --verbose -j `sysctl -n hw.logicalcpu`
6456
fi
6557
cmake --install build

0 commit comments

Comments
 (0)