diff options
| author | Martin Matuska <martin@matuska.org> | 2019-04-07 11:10:56 +0200 |
|---|---|---|
| committer | Martin Matuska <martin@matuska.org> | 2019-04-08 18:45:03 +0200 |
| commit | b9d2dd513c61f4ce71e5d26c1788add341fd7480 (patch) | |
| tree | 7acbc74485ec323b80ee0fedd8d6a3b57fbfd749 /.cirrus.yml | |
| parent | 586ef094ef1cb8ef97169c5e94fb19b65cb0827e (diff) | |
| download | libarchive-b9d2dd513c61f4ce71e5d26c1788add341fd7480.tar.gz | |
Multiple Windows-related CI changes
Add MSVC and Cygwin builds with Cirrus CI (no tests yet)
Remove Travis CI build
TODO: failing UTF8 tests with MSVC still need fixing
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 54 |
1 files changed, 14 insertions, 40 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index bfb20d6e..4906508d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -30,50 +30,24 @@ main_task: - ./build/ci/build.sh -a test - ./build/ci/cirrus_ci.sh test -Windows_Cygwin_task: - windows_container: - image: cirrusci/windowsservercore:2019 - os_version: 2019 - prepare_script: - - 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_task: windows_container: image: cirrusci/windowsservercore:2019 os_version: 2019 + matrix: + env: + BE: mingw-gcc + env: + BE: cygwin-gcc + env: + BE: msvc prepare_script: - - choco install -y --no-progress mingw - - choco install -y --no-progress --installargs 'ADD_CMAKE_TO_PATH=User' cmake - - refreshenv - - mkdir build_ci\mingw - zlib_script: - - refreshenv - - mkdir build_ci\libs - - cd build_ci\libs - - curl -o zlib-1.2.11.tar.gz "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 + - build\ci\cirrus_ci.cmd prepare + deplibs_script: + - build\ci\cirrus_ci.cmd deplibs configure_script: - - refreshenv - - cd build_ci\mingw - - cmake -G "MinGW Makefiles" -D CMAKE_BUILD_TYPE="Release" ..\.. + - build\ci\cirrus_ci.cmd configure build_script: - - refreshenv - - cd build_ci\mingw - - mingw32-make + - build\ci\cirrus_ci.cmd build test_script: - - refreshenv - - copy build_ci\libs\zlib-1.2.11\libzlib.dll build_ci\mingw\bin\ - - cd build_ci\mingw - - set SKIP_TEST_SPARSE=1 - - mingw32-make test + - build\ci\cirrus_ci.cmd test |