Merge 8.5

1 files changed, 13 insertions, 6 deletions

diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index ea4f8b6..8e35798 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -7,27 +7,34 @@ jobs:
       run:
         shell: powershell
         working-directory: win
+    strategy:
+      matrix:
+        cfgopt:
+          - ""
+          - "OPTS=static,msvcrt"
+          - "OPTS=symbols"
+          - "OPTS=memdbg"
     # Using powershell means we need to explicitly stop on failure
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Init MSVC
         uses: ilammy/msvc-dev-cmd@v1
-      - name: Build
+      - name: Build ${{ matrix.cfgopt }}
         run: |
-          &nmake -f makefile.vc all
+          &nmake -f makefile.vc ${{ matrix.cfgopt }} all
           if ($lastexitcode -ne 0) {
              throw "nmake exit code: $lastexitcode"
           }
-      - name: Build Test Harness
+      - name: Build Test Harness ${{ matrix.cfgopt }}
         run: |
-          &nmake -f makefile.vc tcltest
+          &nmake -f makefile.vc ${{ matrix.cfgopt }} tcltest
           if ($lastexitcode -ne 0) {
              throw "nmake exit code: $lastexitcode"
           }
-      - name: Run Tests
+      - name: Run Tests ${{ matrix.cfgopt }}
         run: |
-          &nmake -f makefile.vc test
+          &nmake -f makefile.vc ${{ matrix.cfgopt }} test
           if ($lastexitcode -ne 0) {
              throw "nmake exit code: $lastexitcode"
           }