Skip to content

Commit 5f40b7d

Browse files
committed
Drop upstream clang check as there isn't any reason anymore
1 parent 836b2d7 commit 5f40b7d

File tree

1 file changed

+1
-18
lines changed

1 file changed

+1
-18
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -500,17 +500,6 @@ jobs:
500500
uses: actions/checkout@v2
501501
with:
502502
fetch-depth: 0
503-
- name: Fetch upstream LLVM/clang snapshot
504-
run: |
505-
git config --global safe.directory '*'
506-
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
507-
if [ "$(shasum -a 256 clang+llvm-15.0.7-x86_64-apple-darwin21.0.tar.xz | awk '{ print $1 }')" != "d16b6d536364c5bec6583d12dd7e6cf841b9f508c4430d9ee886726bd9983f1c" ]; then
508-
echo "Bad hash"
509-
exit 1
510-
fi
511-
- name: Unpack upstream LLVM+clang and use it by default
512-
run: |
513-
tar xvvf clang+llvm-15.0.7-x86_64-apple-darwin21.0.tar.xz
514503
- name: Install cbindgen
515504
run: cargo install cbindgen
516505
- name: Checkout Rust-Lightning and LDK-C-Bindings git
@@ -525,13 +514,9 @@ jobs:
525514
git clone https://github.com/lightningdevkit/ldk-c-bindings
526515
cd ldk-c-bindings
527516
git checkout 0.0.115
528-
- name: Rebuild C bindings with upstream clang, and check the sample app builds + links
517+
- name: Rebuild C bindings and check the sample app builds + links
529518
run: |
530-
export PATH=`pwd`/clang+llvm-15.0.7-x86_64-apple-darwin21.0/bin:$PATH
531519
cd ldk-c-bindings
532-
export CC=clang
533-
export CC_x86_64_apple_darwin=clang
534-
export CC_aarch64_apple_darwin=clang
535520
CC=clang ./genbindings.sh ../rust-lightning true
536521
- name: Fetch OpenJDK 18
537522
run: |
@@ -569,7 +554,6 @@ jobs:
569554
export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(git describe --tag HEAD)"
570555
export JAVA_HOME=`pwd`/jdk-18.0.1.1.jdk/Contents/Home
571556
export PATH=$JAVA_HOME/bin:$PATH
572-
export PATH=`pwd`/clang+llvm-15.0.7-x86_64-apple-darwin21.0/bin:$PATH
573557
./genbindings.sh ./ldk-c-bindings/ "-I$JAVA_HOME/include/ -I$JAVA_HOME/include/darwin -isysroot$(xcrun --show-sdk-path)" false false
574558
575559
if [ "${{ matrix.platform }}" = "macos-11" ]; then
@@ -580,7 +564,6 @@ jobs:
580564
cat src/main/resources/liblightningjni_MacOSX-aarch64.nativelib > /dev/null
581565
582566
fi
583-
584567
- name: Fetch Maven 3.8.4
585568
run: |
586569
# We don't bother using the upstream mirrors as they remove prior

0 commit comments

Comments
 (0)