Skip to content

Commit 71709dc

Browse files
committed
Merge #82: ci: Fix x86_64-w64-mingw32 task
ed420bc ci: Fix `x86_64-w64-mingw32` task (Hennadii Stepanov) Pull request description: ACKs for top commit: sipa: utACK ed420bc Tree-SHA512: 9ae670583c983d25982d3fa0ea86f2c65d561dbd79df792edbc1e5d79f7ede03dfad4715ed089480f056c8ef76ca4684a48b3b9e3df90b90df59c9875ed4bfd1
2 parents 9e6127f + ed420bc commit 71709dc

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.cirrus.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ task:
150150
memory: 2G
151151
env:
152152
EXEC_CMD: wine
153+
EXEC_EXT: .exe
153154
HOST: x86_64-w64-mingw32
154155
BUILD:
155156
<< : *MERGE_BASE

ci/cirrus.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ then
3232
fi
3333

3434
if [ -n "$EXEC_CMD" ]; then
35-
$EXEC_CMD ./test $TESTRUNS
36-
$EXEC_CMD ./test-verify $TESTRUNS
35+
$EXEC_CMD "./test$EXEC_EXT" $TESTRUNS
36+
$EXEC_CMD "./test-verify$EXEC_EXT" $TESTRUNS
3737
fi
3838

3939
if [ "$BENCH" = "yes" ]; then
40-
$EXEC_CMD ./bench
40+
$EXEC_CMD "./bench$EXEC_EXT"
4141
fi

ci/linux-debian.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN apt-get install --no-install-recommends --no-upgrade -y \
1111
gcc g++ clang libclang-rt-dev libc6-dbg \
1212
gcc-i686-linux-gnu g++-i686-linux-gnu libc6-dev-i386-cross libc6-dbg:i386 \
1313
g++-s390x-linux-gnu gcc-s390x-linux-gnu libc6-dev-s390x-cross libc6-dbg:s390x \
14-
wine wine32:i386 g++-mingw-w64-x86-64
14+
wine wine64 g++-mingw-w64-x86-64
1515

1616
# Run a dummy command in wine to make it set up configuration
1717
RUN wine true || true

0 commit comments

Comments
 (0)