CI: add windows-cygwin-cmake-build job

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d38382d004e9322d76cb93ca40cbb309ce00e4db..1c4293d503a322ae2ec13b8e885303fb62ff5285 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -671,6 +671,30 @@ windows-mingw64-cmake-build:
     except:
         - tags
 
+windows-cygwin-cmake-build:
+    stage: build
+    needs: []
+    script:
+        - choco install --yes --no-progress cygwin
+        # avoid BOM in COLLECTION file
+        - echo experimental | Out-File COLLECTION -Encoding ascii
+        - $Env:build_system = "cmake"
+        # make Cygwin tolerate CRLF
+        - $Env:SHELLOPTS = "igncr"
+        - C:\tools\cygwin\bin\bash -l -c 'cd $CI_PROJECT_DIR && ci/cygwin-build.sh'
+    artifacts:
+        when: always
+        expire_in: 1 week
+        paths:
+            - VERSION
+            - COLLECTION
+            - Packages/*/*/*/*/*/*.zip
+            - Packages/*/*/*/*/*/*.bz2
+    tags:
+        - windows
+    except:
+        - tags
+
 meta-data:
     stage: test
     script:

diff --git a/ci/build.sh b/ci/build.sh
index 93dacf05929479a939ac780bb238610af5ddb012..d5b41d373e1824835994001555afaa12d68cae55 100755 (executable)
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -46,6 +46,7 @@ if [ "${build_system}" = "cmake" ]; then
         mv build/*.exe ${DIR}/os/${ARCH}/
     elif [[ "${OSTYPE}" =~ "cygwin" ]]; then
         mv build/*.zip ${DIR}/os/${ARCH}/
+        mv build/*.tar.bz2 ${DIR}/os/${ARCH}/
     else
         echo "Error: OSTYPE=${OSTYPE} is unknown" >&2
         exit 1