From 0abacbc927c37c93a90a25770d1e9b059c440bc3 Mon Sep 17 00:00:00 2001
From: Mike Taves <mwtoews@gmail.com>
Date: Wed, 7 Apr 2021 11:25:30 +1200
Subject: CI: build and test on MSYS2 with Windows

---
 .github/workflows/windows.yml | 51 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

(limited to '.github/workflows')

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 13179c18..a4668341 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -60,3 +60,54 @@ jobs:
             set PATH=%PROJ_DIR%\bin;%PATH%
             call %GITHUB_WORKSPACE%\test\postinstall\test_cmake.bat %PROJ_DIR%
             proj
+
+  MSYS2:
+    runs-on: windows-latest
+    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
+
+    defaults:
+      run:
+        shell: msys2 {0}
+
+    env:
+        CMAKE_GENERATOR: "MSYS Makefiles"
+
+    steps:
+
+      - uses: actions/checkout@v2
+
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: MINGW64
+          update: true
+          install:  >-
+            git
+            make
+            mingw-w64-x86_64-cmake
+            mingw-w64-x86_64-curl
+            mingw-w64-x86_64-gcc
+            mingw-w64-x86_64-libtiff
+            mingw-w64-x86_64-sqlite3
+
+      - name: Build
+        run: |
+            PROJ_BUILD=${GITHUB_WORKSPACE}/build
+            PROJ_DIR=${GITHUB_WORKSPACE}/proj_dir
+            mkdir ${PROJ_BUILD}
+            cd ${PROJ_BUILD}
+            cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="${PROJ_DIR}" ..
+            make -j 2
+            make install
+            ls ${PROJ_DIR}/bin
+
+      - name: Run tests
+        run: |
+            PROJ_BUILD=${GITHUB_WORKSPACE}/build
+            PROJ_DIR=${GITHUB_WORKSPACE}/proj_dir
+            export PROJ_LIB=${PROJ_DIR}/share/proj
+            cd ${PROJ_BUILD}
+            ctest --output-on-failure
+            export PATH=${PROJ_DIR}/bin:${PATH}
+            ../test/postinstall/test_cmake.sh ${PROJ_DIR}
+            ../test/postinstall/test_pkg-config.sh ${PROJ_DIR}
+            proj
-- 
cgit v1.2.3


From f21b5521088251250c700c6737494bb54dd53497 Mon Sep 17 00:00:00 2001
From: Mike Taves <mwtoews@gmail.com>
Date: Thu, 8 Apr 2021 09:23:59 +1200
Subject: Drop set/export of PROJ_LIB for Windows CI runs

---
 .github/workflows/windows.yml | 2 --
 1 file changed, 2 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index a4668341..a16de772 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -53,7 +53,6 @@ jobs:
             set VCPKG_INSTALLED=c:\vcpkg\installed\${{ env.ARCH }}-windows
             set PATH=%VCPKG_INSTALLED%\bin;%PATH%
             set PROJ_DIR=%GITHUB_WORKSPACE%\proj_dir
-            set PROJ_LIB=%PROJ_DIR%\share\proj
             set PROJ_BUILD=%GITHUB_WORKSPACE%\build
             cd %PROJ_BUILD%
             ctest -V -C Release
@@ -104,7 +103,6 @@ jobs:
         run: |
             PROJ_BUILD=${GITHUB_WORKSPACE}/build
             PROJ_DIR=${GITHUB_WORKSPACE}/proj_dir
-            export PROJ_LIB=${PROJ_DIR}/share/proj
             cd ${PROJ_BUILD}
             ctest --output-on-failure
             export PATH=${PROJ_DIR}/bin:${PATH}
-- 
cgit v1.2.3