Cirrus CI: add Cygwin build, MinGW build use zlib, suppress download progress

diff --git a/.cirrus.yml b/.cirrus.yml
index 3e30aeecba6f7e8db3a14bf2b583b5e5f9da9c2e..d3627afc9d3d1f48bef17339e2441979307b9483 100644 (file)
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -30,16 +30,42 @@ main_task:
   - ./build/ci/build.sh -a test
   - ./build/ci/cirrus_ci.sh test
 
-Windows_MinGW_task:
+Windows_Cygwin_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'
+  - choco install -y --no-progress cygwin
+  - C:\tools\cygwin\cygwinsetup.exe -q -P make,autoconf,automake,cmake,gcc-core,binutils,libtool,pkg-config,bison,sharutils,zlib-devel,libbz2-devel,liblzma-devel,liblz4-devel,libiconv-devel,libxml2-devel,libzstd-devel,libssl-devel
   configure_script:
+  - set BS=cmake
+  - C:\tools\cygwin\bin\bash.exe --login -c "cd '%cd%'; ./build/ci/build.sh -a configure"
+  build_script:
+  - set BS=cmake
+  - C:\tools\cygwin\bin\bash.exe --login -c "cd '%cd%'; ./build/ci/build.sh -a build"
+
+Windows_MinGW_task:
+  windows_container:
+    image: cirrusci/windowsservercore:2019
+    os_version: 2019
+  prepare_script:
+  - choco install -y --no-progress mingw
+  - choco install -y --no-progress --installargs 'ADD_CMAKE_TO_PATH=User' cmake
+  - choco install -y --no-progress wget
   - refreshenv
   - mkdir build_ci\mingw
+  zlib_script:
+  - refreshenv
+  - mkdir build_ci\libs
+  - cd build_ci\libs
+  - wget "https://www.zlib.net/zlib-1.2.11.tar.gz"
+  - tar -x -z -f zlib-1.2.11.tar.gz
+  - cd zlib-1.2.11
+  - cmake -G "MinGW Makefiles" -D CMAKE_BUILD_TYPE="Release" .
+  - mingw32-make
+  - mingw32-make install
+  configure_script:
+  - refreshenv
   - cd build_ci\mingw
   - cmake -G "MinGW Makefiles" -D CMAKE_BUILD_TYPE="Release" ..\..
   build_script:

diff --git a/test_utils/test_common.h b/test_utils/test_common.h
index dd7e41016d52acc683fdbadf825d29375a9c799b..4ebfdb0cd16754f5c76c7c37ebfcaec197d08b96 100644 (file)
--- a/test_utils/test_common.h
+++ b/test_utils/test_common.h
@@ -83,7 +83,9 @@
 #include <sys/richacl.h>
 #endif
 #ifdef HAVE_WINDOWS_H
+#define NOCRYPT
 #include <windows.h>
+#include <winioctl.h>
 #endif
 
 /*