Skip to content

ci: Fix x86_64-w64-mingw32 task #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 11, 2024
Merged

ci: Fix x86_64-w64-mingw32 task #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ task:
memory: 2G
env:
EXEC_CMD: wine
EXEC_EXT: .exe
HOST: x86_64-w64-mingw32
BUILD:
<< : *MERGE_BASE
Expand Down
6 changes: 3 additions & 3 deletions ci/cirrus.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ci/linux-debian.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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