Skip to content

Commit 9e37a92

Browse files
upgrade(dlang,juptune): use a newer version of Juptune (#10430)
1 parent 0b97f1e commit 9e37a92

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
FROM debian:bookworm-slim
1+
FROM debian:testing
22

33
ARG LDC_VERSION=1.41.0
4-
ARG JUPTUNE_REF=52294fa45912dacac24efc80b4a2fad8db958841
4+
ARG JUPTUNE_REF=30c9b1d8d0420990075d108445641b5b1de64875
55
ARG TFB_TEST_NAME
66

77
ENV TEST_NAME=${TFB_TEST_NAME}
88

99
# Install system deps & LDC
1010
RUN apt update \
11-
&& apt install -y curl xz-utils gnupg libsodium-dev meson unzip pkg-config \
11+
&& apt install -y curl xz-utils gnupg libsodium-dev meson unzip pkg-config clang cmake libssl-dev \
1212
&& curl -fsS https://dlang.org/install.sh | bash -s ldc-${LDC_VERSION}
1313

1414
# Install Juptune
@@ -17,14 +17,15 @@ RUN curl -fsSL https://github.com/Juptune/juptune/archive/${JUPTUNE_REF}.zip -o
1717
&& unzip code.zip \
1818
&& cd juptune* \
1919
&& . ~/dlang/ldc-${LDC_VERSION}/activate \
20-
&& meson setup build --buildtype debugoptimized -Ddefault_library=static \
20+
&& sed -i 's/1.0.20/1.0.18/' meson.build \
21+
&& meson setup build --buildtype release -Dlightweight-results=true -Ddefault_library=static \
2122
&& meson install -C build
2223

2324
# Compile everything
2425
WORKDIR /app
2526
COPY ./src/ .
2627
RUN . ~/dlang/ldc-${LDC_VERSION}/activate \
27-
&& meson setup build --buildtype debugoptimized -Ddefault_library=static \
28+
&& meson setup build --buildtype release -Ddefault_library=static \
2829
&& meson compile -C build
2930

3031
ENTRYPOINT [ "/app/build/juptune-tfb" ]

frameworks/D/juptune/src/meson.build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ dep = declare_dependency(
1919
include_directories: include_directories('.'),
2020
sources: srcs,
2121
dependencies: [juptune_dep],
22+
d_module_versions: [
23+
'Juptune_Result_NoLineInfo',
24+
'Juptune_Result_NoContext'
25+
]
2226
)
2327

2428
#### Executables ####

0 commit comments

Comments
 (0)