From afe4e82c4720a5fe736ca3723f183da6fa60078a Mon Sep 17 00:00:00 2001 From: Lucas Schwiderski Date: Wed, 8 Nov 2023 10:50:42 +0100 Subject: [PATCH] ci: Copy the correct library files --- .ci/image/Dockerfile.linux | 2 +- .ci/image/Dockerfile.msvc | 2 +- .ci/tasks/build.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/image/Dockerfile.linux b/.ci/image/Dockerfile.linux index c4f955f..4927810 100644 --- a/.ci/image/Dockerfile.linux +++ b/.ci/image/Dockerfile.linux @@ -21,4 +21,4 @@ RUN set -eux; \ WORKDIR /src/dtmt -COPY liboo2corelinux64.so /src +COPY *.so *.a /src/ diff --git a/.ci/image/Dockerfile.msvc b/.ci/image/Dockerfile.msvc index 7a501eb..a9eab62 100644 --- a/.ci/image/Dockerfile.msvc +++ b/.ci/image/Dockerfile.msvc @@ -86,4 +86,4 @@ RUN wine wineboot --init WORKDIR /src/dtmt -COPY oo2core_win32.lib oo2core_win64.lib /src +COPY *.lib /src diff --git a/.ci/tasks/build.sh b/.ci/tasks/build.sh index 8db0e69..7029f44 100755 --- a/.ci/tasks/build.sh +++ b/.ci/tasks/build.sh @@ -4,7 +4,7 @@ set -eux case "$TARGET" in msvc) - cp /src/*.lib /src/*.so ./lib/oodle/ + cp /src/*.lib ./lib/oodle/ cargo build --color always --locked --release --target x86_64-pc-windows-msvc -Zbuild-std if [ -d "$OUTPUT" ]; then @@ -13,7 +13,7 @@ case "$TARGET" in fi ;; linux) - cp /src/*.so ./lib/oodle/ + cp /src/*.a ./lib/oodle/ cargo build --color always --locked --profile release-lto if [ -d "$OUTPUT" ]; then