Skip to content

Commit cf53b62

Browse files
committed
make Docker file detect memory leaks
1 parent 2875d40 commit cf53b62

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

ci/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@ 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 clang
6+
RUN apt-get install -y bash curl git make unzip build-essential python3
77
# RUN apt-get install -y cargo
88

99
# install RUST
1010
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
1111
ENV PATH="/root/.cargo/bin:${PATH}"
1212

13+
# install llvm/clang 11
14+
RUN curl -SL https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.0/clang+llvm-11.0.0-x86_64-linux-gnu-ubuntu-20.04.tar.xz | tar -xJC .
15+
1316
#RUN apt-get install -y valgrind
1417
# RUN apt-get install -y python3
1518
# RUN apt-get install -y lld
@@ -35,6 +38,6 @@ COPY bindings/batteries ci/LDKSwift/Sources/LDKSwift/batteries
3538
ENV LDK_C_BINDINGS_BASE="/ldk-c-bindings"
3639
ENV LDK_SWIFT_GENERATOR_INPUT_HEADER_PATH="/ldk-c-bindings/lightning-c-bindings/include/lightning.h"
3740
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"
41+
ENV LLVM_CLANG_ASAN_PATH="/clang+llvm-11.0.0-x86_64-linux-gnu-ubuntu-20.04/lib/clang/11.0.0/lib/linux/libclang_rt.asan-x86_64.a"
3942
ENV RUST_BACKTRACE=1
4043
ENV SHELL=/bin/bash

ci/LDKSwift/Package.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@ let package = Package(
5858
// "SampleTest.swift"
5959
// ],
6060
cSettings: nil, cxxSettings: nil, swiftSettings: nil,
61-
linkerSettings: [
62-
.linkedLibrary(String(utf8String: getenv("LDK_C_BINDINGS_BASE")!)! + "/lightning-c-bindings/target/debug/libldk.a")
63-
])
61+
linkerSettings: nil)
6462

6563
]
6664
)

0 commit comments

Comments
 (0)