From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Thu, 30 Apr 2020 01:02:55 +0000 (-0700)
Subject: Added CI configurations for MSVC ARM and ARM64.
X-Git-Tag: 1.9.9-b1~198
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7290c555784e58ccc3f22c993b14c9660bc4afd;p=thirdparty%2Fzlib-ng.git

Added CI configurations for MSVC ARM and ARM64.
---

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index eab98d84..5963e584 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -44,6 +44,8 @@ jobs:
           Ubuntu Clang MSAN,
           Windows MSVC Win32,
           Windows MSVC Win64,
+          Windows MSVC ARM No Test,
+          Windows MSVC ARM64 No Test,
           Windows GCC,
           Windows GCC Compat,
           Windows GCC Compat No Opt,
@@ -302,6 +304,16 @@ jobs:
             compiler: cl
             cmake-args: -A x64
 
+          - name: Windows MSVC ARM No Test
+            os: windows-latest
+            compiler: cl
+            cmake-args: -A ARM
+
+          - name: Windows MSVC ARM64 No Test
+            os: windows-latest
+            compiler: cl
+            cmake-args: -A ARM64
+
           - name: Windows GCC
             os: windows-latest
             compiler: gcc
@@ -396,6 +408,8 @@ jobs:
         cmake --build . --config ${{ matrix.build-config || 'Release' }}
 
     - name: Run test cases
+      # Don't run tests on Windows ARM
+      if: runner.os != 'Windows' || contains(matrix.name, 'ARM') == false
       run: |
         cd ${{ matrix.build-dir || '.' }}
         ctest -C Release --output-on-failure --max-width 120
diff --git a/.github/workflows/nmake.yml b/.github/workflows/nmake.yml
index 48d00c2d..ecf0eb18 100644
--- a/.github/workflows/nmake.yml
+++ b/.github/workflows/nmake.yml
@@ -9,7 +9,9 @@ jobs:
       matrix:
         name: [
           Windows NMake x86,
-          Windows NMake x64
+          Windows NMake x64,
+          Windows NMake ARM No Test,
+          Windows NMake ARM64 No Test
         ]
         include:
           - name: Windows NMake x86
@@ -22,6 +24,16 @@ jobs:
             makefile: win32/Makefile.msc
             vc-vars: x86_amd64
 
+          - name: Windows NMake ARM No Test
+            os: windows-latest
+            makefile: win32/Makefile.arm
+            vc-vars: x86_arm
+
+          - name: Windows NMake ARM64 No Test
+            os: windows-latest
+            makefile: win32/Makefile.a64
+            vc-vars: x86_arm64
+
     steps:
     - name: Checkout repository
       uses: actions/checkout@v1
@@ -34,6 +46,8 @@ jobs:
 
     - name: Run test cases
       shell: cmd
+      # Don't run tests on Windows ARM
+      if: contains(matrix.vc-vars, 'arm') == false
       run: |
         call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.vc-vars }}
         nmake -f ${{ matrix.makefile }} test