Skip to content

Commit 01459f8

Browse files
committed
Update OSX CI build to LLVM 15.0.7 (matching release builds)
1 parent 96f79a0 commit 01459f8

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -353,14 +353,14 @@ jobs:
353353
fetch-depth: 0
354354
- name: Fetch upstream LLVM/clang snapshot
355355
run: |
356-
wget -O clang+llvm-15.0.3-x86_64-apple-darwin.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/clang+llvm-15.0.3-x86_64-apple-darwin.tar.xz
357-
if [ "$(shasum -a 256 clang+llvm-15.0.3-x86_64-apple-darwin.tar.xz | awk '{ print $1 }')" != "ac668586b2b3d068f1e43520a3ef0b1592e5dc3eff1a4a4b772e29803b428a69" ]; then
356+
wget -O clang+llvm-15.0.7-x86_64-apple-darwin21.0.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/clang+llvm-15.0.7-x86_64-apple-darwin21.0.tar.xz
357+
if [ "$(shasum -a 256 clang+llvm-15.0.7-x86_64-apple-darwin21.0.tar.xz | awk '{ print $1 }')" != "d16b6d536364c5bec6583d12dd7e6cf841b9f508c4430d9ee886726bd9983f1c" ]; then
358358
echo "Bad hash"
359359
exit 1
360360
fi
361361
- name: Unpack upstream LLVM+clang and use it by default
362362
run: |
363-
tar xvvf clang+llvm-15.0.3-x86_64-apple-darwin.tar.xz
363+
tar xvvf clang+llvm-15.0.7-x86_64-apple-darwin21.0.tar.xz
364364
- name: Install cbindgen
365365
run: cargo install cbindgen
366366
- name: Checkout Rust-Lightning and LDK-C-Bindings git
@@ -377,7 +377,7 @@ jobs:
377377
git checkout 0.0.114
378378
- name: Rebuild C bindings with upstream clang, and check the sample app builds + links
379379
run: |
380-
export PATH=`pwd`/clang+llvm-15.0.3-x86_64-apple-darwin/bin:$PATH
380+
export PATH=`pwd`/clang+llvm-15.0.7-x86_64-apple-darwin21.0/bin:$PATH
381381
cd ldk-c-bindings
382382
CC=clang ./genbindings.sh ../rust-lightning true
383383
- name: Fetch OpenJDK 18
@@ -416,7 +416,7 @@ jobs:
416416
export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(git describe --tag HEAD)"
417417
export JAVA_HOME=`pwd`/jdk-18.0.1.1.jdk/Contents/Home
418418
export PATH=$JAVA_HOME/bin:$PATH
419-
export PATH=`pwd`/clang+llvm-15.0.3-x86_64-apple-darwin/bin:$PATH
419+
export PATH=`pwd`/clang+llvm-15.0.7-x86_64-apple-darwin21.0/bin:$PATH
420420
./genbindings.sh ./ldk-c-bindings/ "-I$JAVA_HOME/include/ -I$JAVA_HOME/include/darwin -isysroot$(xcrun --show-sdk-path)" false false
421421
422422
if [ "${{ matrix.platform }}" = "macos-11" ]; then

0 commit comments

Comments
 (0)