Cirrus CI: Add MinGW and split into stages

diff --git a/.cirrus.yml b/.cirrus.yml
index 28d38213f95bfe15a0373484242b0812a4e25ea1..3e30aeecba6f7e8db3a14bf2b583b5e5f9da9c2e 100644 (file)
--- 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 4def08374f296f751ab00d860225d037afb25164..c07ebfe97beaec62f57f37b69143f9fbc679116a 100755 (executable)
--- 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