From 977738c09c97e2377f1821759bad999d4553ceb7 Mon Sep 17 00:00:00 2001 From: JCWasmx86 Date: Sat, 1 Feb 2025 08:58:54 +0100 Subject: [PATCH] Attempt to fix CI --- Dockerfile | 2 +- docker/Dockerfile.debiansid | 2 +- docker/Dockerfile.debiantrixie | 2 +- scripts/ci_create_zip.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9add1d42b8..ce2746fea8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,7 +28,7 @@ RUN meson setup _static --default-library=static --prefer-static \ -Dcpp_link_args='-static-libgcc -static-libstdc++' -Dstatic_build=true \ --buildtype=release -Db_lto=true --force-fallback-for=libpkgconf RUN ninja -C _static -j2 -RUN ninja -C _static test +RUN meson test -C _static "mesonlsp:" RUN _static/tests/libcxathrow/cxathrowtest RUN mkdir /app/exportDir RUN cp _static/src/mesonlsp /app/exportDir diff --git a/docker/Dockerfile.debiansid b/docker/Dockerfile.debiansid index 00acd98641..b612293c79 100644 --- a/docker/Dockerfile.debiansid +++ b/docker/Dockerfile.debiansid @@ -11,7 +11,7 @@ COPY subprojects /app/subprojects RUN meson setup _build --buildtype=release -Db_lto=true RUN ninja -C _build -RUN ninja -C _build test +RUN meson test -C _build "mesonlsp:" RUN _build/tests/libcxathrow/cxathrowtest RUN mkdir /app/exportDir RUN cp _build/src/mesonlsp /app/exportDir diff --git a/docker/Dockerfile.debiantrixie b/docker/Dockerfile.debiantrixie index a2b2b551a2..a6dca118c3 100644 --- a/docker/Dockerfile.debiantrixie +++ b/docker/Dockerfile.debiantrixie @@ -11,7 +11,7 @@ COPY subprojects /app/subprojects RUN meson setup _build --buildtype=release -Db_lto=true RUN ninja -C _build -RUN ninja -C _build test +RUN meson test -C _build "mesonlsp:" RUN _build/tests/libcxathrow/cxathrowtest RUN mkdir /app/exportDir RUN cp _build/src/mesonlsp /app/exportDir diff --git a/scripts/ci_create_zip.sh b/scripts/ci_create_zip.sh index 3be0c7eb0c..38cd35f3de 100755 --- a/scripts/ci_create_zip.sh +++ b/scripts/ci_create_zip.sh @@ -9,7 +9,7 @@ meson setup _build --buildtype debug # shellcheck disable=SC2086 ninja -C _build $2 || exit 1 # shellcheck disable=SC2086 -ninja -C _build test $2 || exit 1 +meson test -C _build "mesonlsp:" $2 || exit 1 ./_build/tests/libcxathrow/cxathrowtest cp _build/src/mesonlsp mesonlsp.debug zip -9 "$1".zip mesonlsp.debug mesonlsp