Add mingw32-w64 CI build

sipa · Apr 17, 2021 · bf514d4 · bf514d4
1 parent e8c0394
commit bf514d4
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -27,7 +27,7 @@ task:
     dockerfile: ci/linux-debian.Dockerfile
     memory: 2G
     cpu: 4
-  matrix: &ENV_MATRIX
+  matrix: &ENV_MATRIX_VALGRIND
     - env: {}
     - env: {BUILD: distcheck}
     - env:
@@ -69,7 +69,7 @@ task:
   env:
     # Cirrus gives us a fixed number of 12 virtual CPUs.
     MAKEFLAGS: -j13
-  matrix:
+  matrix: &ENV_MATRIX_NO_VALGRIND
     - env: {}
     - env: {BUILD: distcheck}
     - env:
@@ -104,3 +104,21 @@ task:
     - rm /etc/ld.so.cache
     - ./ci/cirrus.sh
   << : *CAT_LOGS
+
+task:
+  name: "x86_64-w64-mingw32: Linux (Debian stable, Wine)"
+  container:
+    dockerfile: ci/linux-debian.Dockerfile
+    cpu: 4
+    memory: 2G
+  env:
+    WINE_CMD: wine
+    HOST: x86_64-w64-mingw32
+    CXXFLAGS: -O2 -static -static-libgcc -static-libstdc++
+    BUILD:
+  matrix:
+    << : *ENV_MATRIX_NO_VALGRIND
+  << : *MERGE_BASE
+  test_script:
+    - ./ci/cirrus.sh
+  << : *CAT_LOGS
diff --git a/ci/cirrus.sh b/ci/cirrus.sh
@@ -39,3 +39,9 @@ then
     $QEMU_CMD ./test
     $QEMU_CMD ./test-verify
 fi
+
+if [ -n "$WINE_CMD" ]
+then
+    $WINE_CMD ./test.exe
+    $WINE_CMD ./test-verify.exe
+fi
diff --git a/ci/linux-debian.Dockerfile b/ci/linux-debian.Dockerfile
@@ -10,4 +10,8 @@ RUN apt-get install --no-install-recommends --no-upgrade -y \
         make automake libtool pkg-config dpkg-dev valgrind qemu-user \
         gcc g++ clang 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
+        g++-s390x-linux-gnu gcc-s390x-linux-gnu libc6-dev-s390x-cross libc6-dbg:s390x \
+        wine g++-mingw-w64-x86-64
+
+# Run a dummy command in wine to make it set up configuration
+RUN wine true || true