Skip to content

Commit 2875d40

Browse files
committed
make asan library path dynamic
1 parent 6a7e20e commit 2875d40

File tree

3 files changed

+18
-5
lines changed

3 files changed

+18
-5
lines changed

.github/workflows/swift.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,11 @@ jobs:
5656
python ci/fix_header_includes.py
5757
- name: Generate Swift bindings and copy batteries
5858
run: |
59-
LDK_SWIFT_GENERATOR_INPUT_HEADER_PATH="ldk-c-bindings/lightning-c-bindings/include/lightning.h" LDK_SWIFT_GENERATOR_OUTPUT_DIRECTORY_PATH="ci/LDKSwift/Sources/LDKSwift" python ./
59+
python ./
6060
cp -R bindings/batteries ci/LDKSwift/Sources/LDKSwift
61+
env:
62+
LDK_SWIFT_GENERATOR_INPUT_HEADER_PATH: ldk-c-bindings/lightning-c-bindings/include/lightning.h
63+
LDK_SWIFT_GENERATOR_OUTPUT_DIRECTORY_PATH: ci/LDKSwift/Sources/LDKSwift
6164
- name: Fix Swift files
6265
run: |
6366
python ci/fix_swift_imports.py
@@ -67,12 +70,20 @@ jobs:
6770
- name: Build Swift bindings package
6871
run: |
6972
cd ci/LDKSwift
70-
LDK_C_BINDINGS_BASE="../../ldk-c-bindings" RUST_BACKTRACE=1 ../../swift-5.4.2-RELEASE-ubuntu20.04/usr/bin/swift build
73+
../../swift-5.4.2-RELEASE-ubuntu20.04/usr/bin/swift build
7174
cd ../../
75+
env:
76+
LDK_C_BINDINGS_BASE: /home/runner/work/ldk-swift/ldk-swift/ldk-c-bindings
77+
LLVM_CLANG_ASAN_PATH: /usr/lib/llvm-11/lib/clang/11.0.0/lib/linux/libclang_rt.asan-x86_64.a
78+
RUST_BACKTRACE: 1
7279
- name: Test Swift bindings package
7380
run: |
7481
cd ci/LDKSwift
75-
LDK_C_BINDINGS_BASE="/home/runner/work/ldk-swift/ldk-swift/ldk-c-bindings" RUST_BACKTRACE=1 ../../swift-5.4.2-RELEASE-ubuntu20.04/usr/bin/swift test -v
82+
../../swift-5.4.2-RELEASE-ubuntu20.04/usr/bin/swift test -v
83+
env:
84+
LDK_C_BINDINGS_BASE: /home/runner/work/ldk-swift/ldk-swift/ldk-c-bindings
85+
LLVM_CLANG_ASAN_PATH: /usr/lib/llvm-11/lib/clang/11.0.0/lib/linux/libclang_rt.asan-x86_64.a
86+
RUST_BACKTRACE: 1
7687
- name: Check that the latest headers are in the swift repo
7788
run: |
7889
git diff --exit-code

ci/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM swift:bionic
33

44
RUN apt-get -y update
55
RUN apt-get -y dist-upgrade
6-
RUN apt-get install -y bash curl git make unzip build-essential python3
6+
RUN apt-get install -y bash curl git make unzip build-essential python3 clang
77
# RUN apt-get install -y cargo
88

99
# install RUST
@@ -35,5 +35,6 @@ COPY bindings/batteries ci/LDKSwift/Sources/LDKSwift/batteries
3535
ENV LDK_C_BINDINGS_BASE="/ldk-c-bindings"
3636
ENV LDK_SWIFT_GENERATOR_INPUT_HEADER_PATH="/ldk-c-bindings/lightning-c-bindings/include/lightning.h"
3737
ENV LDK_SWIFT_GENERATOR_OUTPUT_DIRECTORY_PATH="/ci/LDKSwift/Sources/LDKSwift"
38+
ENV LLVM_CLANG_ASAN_PATH="/usr/lib/llvm-6.0/lib/clang/6.0.0/lib/linux/libclang_rt.asan-x86_64.a"
3839
ENV RUST_BACKTRACE=1
3940
ENV SHELL=/bin/bash

ci/LDKSwift/Package.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ let package = Package(
4444
swiftSettings: nil,
4545
linkerSettings: [
4646
.linkedLibrary(String(utf8String: getenv("LDK_C_BINDINGS_BASE")!)! + "/lightning-c-bindings/target/debug/libldk.a"),
47-
.linkedLibrary("/usr/lib/llvm-11/lib/clang/11.0.0/lib/linux/libclang_rt.asan-x86_64.a")
47+
// .linkedLibrary("/usr/lib/llvm-11/lib/clang/11.0.0/lib/linux/libclang_rt.asan-x86_64.a")
48+
.linkedLibrary(String(utf8String: getenv("LLVM_CLANG_ASAN_PATH")!)!)
4849
]),
4950
.testTarget(
5051
name: "LDKSwiftTests",

0 commit comments

Comments
 (0)