Skip to content

Commit b0316b7

Browse files
committed
ci: update to LLVM 20 on MacOS and Linux CI and releases
1 parent 5eaff20 commit b0316b7

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,14 @@ jobs:
9393
- name: Download LLVM (MacOS Intel)
9494
if: matrix.os == 'macos-13'
9595
run: |
96-
brew install llvm@18 [email protected]
97-
echo "/usr/local/opt/llvm@18/bin" >> $GITHUB_PATH
96+
brew install llvm@20 [email protected] lld
97+
echo "/usr/local/opt/llvm@20/bin" >> $GITHUB_PATH
9898
9999
- name: Download LLVM (MacOS ARM)
100100
if: matrix.os == 'macos-14'
101101
run: |
102-
brew install llvm@18 wasmtime [email protected]
103-
echo "/opt/homebrew/opt/llvm@18/bin" >> $GITHUB_PATH
102+
brew install llvm@20 wasmtime [email protected] lld
103+
echo "/opt/homebrew/opt/llvm@20/bin" >> $GITHUB_PATH
104104
105105
- name: Build Odin
106106
run: ./build_odin.sh release

.github/workflows/nightly.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ jobs:
4949
- uses: actions/checkout@v4
5050
- uses: jirutka/setup-alpine@v1
5151
with:
52-
branch: v3.20
52+
branch: edge
5353
- name: (Linux) Download LLVM
5454
run: |
5555
apk add --no-cache \
56-
musl-dev llvm18-dev clang18 git mold lz4 \
57-
libxml2-static llvm18-static zlib-static zstd-static \
56+
musl-dev llvm20-dev clang20 git mold lz4 \
57+
libxml2-static llvm20-static zlib-static zstd-static \
5858
make
5959
shell: alpine.sh --root {0}
6060
- name: build odin
@@ -93,8 +93,8 @@ jobs:
9393
- uses: actions/checkout@v4
9494
- name: Download LLVM and setup PATH
9595
run: |
96-
brew install llvm@18 dylibbundler
97-
echo "/usr/local/opt/llvm@18/bin" >> $GITHUB_PATH
96+
brew install llvm@20 dylibbundler lld
97+
echo "/usr/local/opt/llvm@20/bin" >> $GITHUB_PATH
9898
- name: build odin
9999
# These -L makes the linker prioritize system libraries over LLVM libraries, this is mainly to
100100
# not link with libunwind bundled with LLVM but link with libunwind on the system.
@@ -130,8 +130,8 @@ jobs:
130130
- uses: actions/checkout@v4
131131
- name: Download LLVM and setup PATH
132132
run: |
133-
brew install llvm@18 dylibbundler
134-
echo "/opt/homebrew/opt/llvm@18/bin" >> $GITHUB_PATH
133+
brew install llvm@20 dylibbundler lld
134+
echo "/opt/homebrew/opt/llvm@20/bin" >> $GITHUB_PATH
135135
- name: build odin
136136
# These -L makes the linker prioritize system libraries over LLVM libraries, this is mainly to
137137
# not link with libunwind bundled with LLVM but link with libunwind on the system.

build_odin.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ error() {
2525

2626
# Brew advises people not to add llvm to their $PATH, so try and use brew to find it.
2727
if [ -z "$LLVM_CONFIG" ] && [ -n "$(command -v brew)" ]; then
28-
if [ -n "$(command -v $(brew --prefix llvm)/bin/llvm-config)" ]; then LLVM_CONFIG="$(brew --prefix llvm)/bin/llvm-config"
28+
if [ -n "$(command -v $(brew --prefix llvm@20)/bin/llvm-config)" ]; then LLVM_CONFIG="$(brew --prefix llvm@20)/bin/llvm-config"
2929
elif [ -n "$(command -v $(brew --prefix llvm@19)/bin/llvm-config)" ]; then LLVM_CONFIG="$(brew --prefix llvm@19)/bin/llvm-config"
3030
elif [ -n "$(command -v $(brew --prefix llvm@18)/bin/llvm-config)" ]; then LLVM_CONFIG="$(brew --prefix llvm@18)/bin/llvm-config"
3131
elif [ -n "$(command -v $(brew --prefix llvm@17)/bin/llvm-config)" ]; then LLVM_CONFIG="$(brew --prefix llvm@17)/bin/llvm-config"

ci/build_linux_static.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env sh
22
# Intended for use in Alpine containers, see the "nightly" Github action for a list of dependencies
33

4-
CXX="clang++-18"
5-
LLVM_CONFIG="llvm-config-18"
4+
CXX="clang++-20"
5+
LLVM_CONFIG="llvm-config-20"
66

77
DISABLED_WARNINGS="-Wno-switch -Wno-macro-redefined -Wno-unused-value"
88

0 commit comments

Comments
 (0)