From 48f1bf3fbfa90a8632af9c9c868ca770d780695c Mon Sep 17 00:00:00 2001
From: Timo Heister <timo.heister@gmail.com>
Date: Mon, 11 May 2020 16:34:43 -0400
Subject: [PATCH] github actions: split windows build

- move windows build out of main.yml
- test VS 2017 and VS 2019
---
 .github/workflows/main.yml    | 38 -----------------------------
 .github/workflows/windows.yml | 46 +++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 38 deletions(-)
 create mode 100644 .github/workflows/windows.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ed94dd6192..baeeedb23a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -96,41 +96,3 @@ jobs:
         make -j 2
         make -j 2 test #quicktests
 
-  windows-serial:
-    # Serial build on Windows
-    name: Windows Serial
-    runs-on: [windows-latest]
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: info
-      run: |
-        cmake --version
-        wmic logicaldisk get size, freespace, caption
-    - name: configure
-      shell: bash
-      run: |
-        mkdir build
-        mkdir c:/project
-        cd build
-        cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=c:/project ..
-    - name: archive logs
-      uses: actions/upload-artifact@v1
-      with:
-        name: windows-serial-detailed.log
-        path: build/detailed.log
-    - name: build library
-      shell: bash
-      run: |
-        cmake --build build  --target install -- -m
-        cd c:/project
-        7z a dealii-windows.zip *
-    - name: test library
-      shell: bash
-      run: |
-        cmake --build build  --target test -- -m
-    - name: archive library
-      uses: actions/upload-artifact@v1
-      with:
-        name: dealii-windows.zip
-        path: c:/project/dealii-windows.zip
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
new file mode 100644
index 0000000000..4e209cbb67
--- /dev/null
+++ b/.github/workflows/windows.yml
@@ -0,0 +1,46 @@
+name: github-windows
+
+on: [push, pull_request]
+
+jobs:
+  windows-serial:
+    # Serial build on Windows
+    name: Windows Serial
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [windows-2019, windows-2016]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: info
+      run: |
+        cmake --version
+        wmic logicaldisk get size, freespace, caption
+    - name: configure
+      shell: bash
+      run: |
+        mkdir build
+        mkdir c:/project
+        cd build
+        cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=c:/project ..
+    - name: archive logs
+      uses: actions/upload-artifact@v1
+      with:
+        name: windows-serial-detailed.log
+        path: build/detailed.log
+    - name: build library
+      shell: bash
+      run: |
+        cmake --build build  --target install -- -m
+        cd c:/project
+        7z a dealii-windows.zip *
+    - name: test library
+      shell: bash
+      run: |
+        cmake --build build  --target test -- -m
+    - name: archive library
+      uses: actions/upload-artifact@v1
+      with:
+        name: dealii-windows.zip
+        path: c:/project/dealii-windows.zip
-- 
2.39.5