From 49e0e06f47f1df00e04f7fe20ecafac3feaf6ec5 Mon Sep 17 00:00:00 2001
From: Martin Matuska <martin@matuska.org>
Date: Sat, 30 Mar 2019 22:40:03 +0100
Subject: [PATCH] Cirrus CI: Add MinGW and split into stages

---
 .cirrus.yml           | 34 ++++++++++++++++++++++++++++------
 build/ci/cirrus_ci.sh |  4 ++--
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 28d38213f..3e30aeecb 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -2,7 +2,7 @@ env:
   CIRRUS_CLONE_DEPTH: 1
   ARCH: amd64
 
-task:
+main_task:
   matrix:
     container:
       image: fedora:29
@@ -19,8 +19,30 @@ task:
       BS: autotools
     env:
       BS: cmake
-  install_script:
-    - ./build/ci/cirrus_ci.sh install
-  script:
-    - ./build/ci/build.sh
-    - ./build/ci/cirrus_ci.sh test
+  prepare_script:
+  - ./build/ci/cirrus_ci.sh prepare
+  configure_script:
+  - ./build/ci/build.sh -a autogen
+  - ./build/ci/build.sh -a configure
+  build_script:
+  - ./build/ci/build.sh -a build
+  test_script:
+  - ./build/ci/build.sh -a test
+  - ./build/ci/cirrus_ci.sh test
+
+Windows_MinGW_task:
+  windows_container:
+    image: cirrusci/windowsservercore:2019
+    os_version: 2019
+  prepare_script:
+  - choco install -y mingw
+  - choco install -y cmake --installargs 'ADD_CMAKE_TO_PATH=User'
+  configure_script:
+  - refreshenv
+  - mkdir build_ci\mingw
+  - cd build_ci\mingw
+  - cmake -G "MinGW Makefiles" -D CMAKE_BUILD_TYPE="Release" ..\..
+  build_script:
+  - refreshenv
+  - cd build_ci\mingw
+  - mingw32-make
diff --git a/build/ci/cirrus_ci.sh b/build/ci/cirrus_ci.sh
index 4def08374..c07ebfe97 100755
--- a/build/ci/cirrus_ci.sh
+++ b/build/ci/cirrus_ci.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 UNAME=`uname`
-if [ "$1" = "install" ]
+if [ "$1" = "prepare" ]
 then
 	if [ "${UNAME}" = "FreeBSD" ]
 	then
@@ -51,6 +51,6 @@ then
 		TMPDIR=/tmp_acl_nfsv4 ${BIN_SUBDIR}/libarchive_test -r "${CURDIR}/libarchive/test" -v test_acl_platform_nfs4
 	fi
 else
-	echo "Usage $0 install | test_nfsv4_acls"
+	echo "Usage $0 prepare | test_nfsv4_acls"
 	exit 1
 fi
-- 
2.47.2