ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-07 08:08:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: update to LLVM 20 on MacOS and Linux CI and releases

Browse Source
This commit is contained in:
Laytan
2025-04-02 21:13:10 +02:00
parent 5eaff20f4a
commit b0316b7076
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci.yml
+4 -4
View File
@@ -93,14 +93,14 @@ jobs:
- name: Download LLVM (MacOS Intel) - name: Download LLVM (MacOS Intel)
if: matrix.os == 'macos-13' if: matrix.os == 'macos-13'
run: | run: |
brew install llvm@18 lua@5.4 brew install llvm@20 lua@5.4 lld
echo "/usr/local/opt/llvm@18/bin" >> $GITHUB_PATH echo "/usr/local/opt/llvm@20/bin" >> $GITHUB_PATH
- name: Download LLVM (MacOS ARM) - name: Download LLVM (MacOS ARM)
if: matrix.os == 'macos-14' if: matrix.os == 'macos-14'
run: | run: |
brew install llvm@18 wasmtime lua@5.4 brew install llvm@20 wasmtime lua@5.4 lld
echo "/opt/homebrew/opt/llvm@18/bin" >> $GITHUB_PATH echo "/opt/homebrew/opt/llvm@20/bin" >> $GITHUB_PATH
- name: Build Odin - name: Build Odin
run: ./build_odin.sh release run: ./build_odin.sh release
.github/workflows/nightly.yml
+7 -7
View File
@@ -49,12 +49,12 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: jirutka/setup-alpine@v1 - uses: jirutka/setup-alpine@v1
with: with:
branch: v3.20 branch: edge
- name: (Linux) Download LLVM - name: (Linux) Download LLVM
run: | run: |
apk add --no-cache \ apk add --no-cache \
musl-dev llvm18-dev clang18 git mold lz4 \ musl-dev llvm20-dev clang20 git mold lz4 \
libxml2-static llvm18-static zlib-static zstd-static \ libxml2-static llvm20-static zlib-static zstd-static \
make make
shell: alpine.sh --root {0} shell: alpine.sh --root {0}
- name: build odin - name: build odin
@@ -93,8 +93,8 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Download LLVM and setup PATH - name: Download LLVM and setup PATH
run: | run: |
brew install llvm@18 dylibbundler brew install llvm@20 dylibbundler lld
echo "/usr/local/opt/llvm@18/bin" >> $GITHUB_PATH echo "/usr/local/opt/llvm@20/bin" >> $GITHUB_PATH
- name: build odin - name: build odin
# These -L makes the linker prioritize system libraries over LLVM libraries, this is mainly to # These -L makes the linker prioritize system libraries over LLVM libraries, this is mainly to
# not link with libunwind bundled with LLVM but link with libunwind on the system. # not link with libunwind bundled with LLVM but link with libunwind on the system.
@@ -130,8 +130,8 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Download LLVM and setup PATH - name: Download LLVM and setup PATH
run: | run: |
brew install llvm@18 dylibbundler brew install llvm@20 dylibbundler lld
echo "/opt/homebrew/opt/llvm@18/bin" >> $GITHUB_PATH echo "/opt/homebrew/opt/llvm@20/bin" >> $GITHUB_PATH
- name: build odin - name: build odin
# These -L makes the linker prioritize system libraries over LLVM libraries, this is mainly to # These -L makes the linker prioritize system libraries over LLVM libraries, this is mainly to
# not link with libunwind bundled with LLVM but link with libunwind on the system. # not link with libunwind bundled with LLVM but link with libunwind on the system.
build_odin.sh
+1 -1
View File
@@ -25,7 +25,7 @@ error() {
# Brew advises people not to add llvm to their $PATH, so try and use brew to find it. # Brew advises people not to add llvm to their $PATH, so try and use brew to find it.
if [ -z "$LLVM_CONFIG" ] && [ -n "$(command -v brew)" ]; then if [ -z "$LLVM_CONFIG" ] && [ -n "$(command -v brew)" ]; then
if [ -n "$(command -v $(brew --prefix llvm)/bin/llvm-config)" ]; then LLVM_CONFIG="$(brew --prefix llvm)/bin/llvm-config" if [ -n "$(command -v $(brew --prefix llvm@20)/bin/llvm-config)" ]; then LLVM_CONFIG="$(brew --prefix llvm@20)/bin/llvm-config"
elif [ -n "$(command -v $(brew --prefix llvm@19)/bin/llvm-config)" ]; then LLVM_CONFIG="$(brew --prefix llvm@19)/bin/llvm-config" elif [ -n "$(command -v $(brew --prefix llvm@19)/bin/llvm-config)" ]; then LLVM_CONFIG="$(brew --prefix llvm@19)/bin/llvm-config"
elif [ -n "$(command -v $(brew --prefix llvm@18)/bin/llvm-config)" ]; then LLVM_CONFIG="$(brew --prefix llvm@18)/bin/llvm-config" elif [ -n "$(command -v $(brew --prefix llvm@18)/bin/llvm-config)" ]; then LLVM_CONFIG="$(brew --prefix llvm@18)/bin/llvm-config"
elif [ -n "$(command -v $(brew --prefix llvm@17)/bin/llvm-config)" ]; then LLVM_CONFIG="$(brew --prefix llvm@17)/bin/llvm-config" 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
+2 -2
View File
@@ -1,8 +1,8 @@
#!/usr/bin/env sh #!/usr/bin/env sh
# Intended for use in Alpine containers, see the "nightly" Github action for a list of dependencies # Intended for use in Alpine containers, see the "nightly" Github action for a list of dependencies
CXX="clang++-18" CXX="clang++-20"
LLVM_CONFIG="llvm-config-18" LLVM_CONFIG="llvm-config-20"
DISABLED_WARNINGS="-Wno-switch -Wno-macro-redefined -Wno-unused-value" DISABLED_WARNINGS="-Wno-switch -Wno-macro-redefined -Wno-unused-value"