From ed420bc170cbe003a6a892ad0af7b83ecc06535d Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Wed, 10 Apr 2024 09:57:47 +0200 Subject: [PATCH] ci: Fix `x86_64-w64-mingw32` task --- .cirrus.yml | 1 + ci/cirrus.sh | 6 +++--- ci/linux-debian.Dockerfile | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index fae2b72..76b05ca 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -150,6 +150,7 @@ task: memory: 2G env: EXEC_CMD: wine + EXEC_EXT: .exe HOST: x86_64-w64-mingw32 BUILD: << : *MERGE_BASE diff --git a/ci/cirrus.sh b/ci/cirrus.sh index 812cf23..36250d1 100755 --- a/ci/cirrus.sh +++ b/ci/cirrus.sh @@ -32,10 +32,10 @@ then fi if [ -n "$EXEC_CMD" ]; then - $EXEC_CMD ./test $TESTRUNS - $EXEC_CMD ./test-verify $TESTRUNS + $EXEC_CMD "./test$EXEC_EXT" $TESTRUNS + $EXEC_CMD "./test-verify$EXEC_EXT" $TESTRUNS fi if [ "$BENCH" = "yes" ]; then - $EXEC_CMD ./bench + $EXEC_CMD "./bench$EXEC_EXT" fi diff --git a/ci/linux-debian.Dockerfile b/ci/linux-debian.Dockerfile index e8c8358..3ca01f8 100644 --- a/ci/linux-debian.Dockerfile +++ b/ci/linux-debian.Dockerfile @@ -11,7 +11,7 @@ RUN apt-get install --no-install-recommends --no-upgrade -y \ gcc g++ clang libclang-rt-dev libc6-dbg \ gcc-i686-linux-gnu g++-i686-linux-gnu libc6-dev-i386-cross libc6-dbg:i386 \ g++-s390x-linux-gnu gcc-s390x-linux-gnu libc6-dev-s390x-cross libc6-dbg:s390x \ - wine wine32:i386 g++-mingw-w64-x86-64 + wine wine64 g++-mingw-w64-x86-64 # Run a dummy command in wine to make it set up configuration RUN wine true || true