From 1643392b613402287f6d172753696a99370bde84 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 16 Oct 2022 20:28:56 +0000
Subject: Let the Github Actions CI runner build in both release and debug
 modes with MSVC. Also, upgrade from windows-2019 to windows-2022 when
 building with MSVC, so that issue [d93c8175fd] triggers.

---
 .github/workflows/win-build.yml | 47 +++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index a79087f..1da53b6 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -6,18 +6,23 @@ env:
   ERROR_ON_FAILURES: 1
 jobs:
   msvc:
-    runs-on: windows-2019
+    runs-on: windows-2022
     defaults:
       run:
         shell: powershell
         working-directory: tk/win
     # Using powershell means we need to explicitly stop on failure
+    strategy:
+      matrix:
+        symbols:
+          - "none"
+          - "symbols"
     steps:
-      - name: Checkout
+      - name: Checkout Tk
         uses: actions/checkout@v3
         with:
           path: tk
-      - name: Checkout
+      - name: Checkout Tcl
         uses: actions/checkout@v3
         with:
           repository: tcltk/tcl
@@ -33,32 +38,32 @@ jobs:
           mkdir install
           cd install
           echo "INSTALLDIR=`pwd`" >> $GITHUB_ENV
-      - name: Build Tcl
+      - name: Build Tcl (OPTS=${{ matrix.symbols }})
         run: |
-          &nmake -f makefile.vc release install
+          &nmake -f makefile.vc release install OPTS=${{ matrix.symbols }}
           if ($lastexitcode -ne 0) {
              throw "nmake exit code: $lastexitcode"
           }
         working-directory: tcl/win
-      - name: Build
+      - name: Build Tk (OPTS=${{ matrix.symbols }})
         run: |
-          &nmake -f makefile.vc all
+          &nmake -f makefile.vc all OPTS=${{ matrix.symbols }}
           if ($lastexitcode -ne 0) {
              throw "nmake exit code: $lastexitcode"
           }
-      - name: Build Test Harness
+      - name: Build Test Harness (OPTS=${{ matrix.symbols }})
         run: |
-          &nmake -f makefile.vc tktest
+          &nmake -f makefile.vc tktest OPTS=${{ matrix.symbols }}
           if ($lastexitcode -ne 0) {
              throw "nmake exit code: $lastexitcode"
           }
-      - name: Run Tests
+      - name: Run Tk Tests (OPTS=${{ matrix.symbols }})
         run: |
-          nmake -f makefile.vc test-classic | tee out-classic.txt || {
+          nmake -f makefile.vc test-classic OPTS=${{ matrix.symbols }} | tee out-classic.txt || {
             echo "::error::Failure during Test"
             exit 1
           }
-          nmake -f makefile.vc test-ttk | tee out-ttk.txt || {
+          nmake -f makefile.vc test-ttk OPTS=${{ matrix.symbols }} | tee out-ttk.txt || {
             echo "::error::Failure during Test"
             exit 1
           }
@@ -73,15 +78,15 @@ jobs:
         env:
           CI_BUILD_WITH_MSVC: 1
         shell: bash
-      - name: Build Help
+      - name: Build Help (OPTS=${{ matrix.symbols }})
         run: |
-          &nmake -f makefile.vc htmlhelp
+          &nmake -f makefile.vc htmlhelp OPTS=${{ matrix.symbols }}
           if ($lastexitcode -ne 0) {
              throw "nmake exit code: $lastexitcode"
           }
-      - name: Install
+      - name: Install (OPTS=${{ matrix.symbols }})
         run: |
-          &nmake -f makefile.vc install
+          &nmake -f makefile.vc install OPTS=${{ matrix.symbols }}
           if ($lastexitcode -ne 0) {
              throw "nmake exit code: $lastexitcode"
           }
@@ -103,9 +108,9 @@ jobs:
         with:
           msystem: MINGW64
           install: git mingw-w64-x86_64-toolchain make
-      - name: Checkout
+      - name: Checkout Tk
         uses: actions/checkout@v3
-      - name: Checkout
+      - name: Checkout Tcl
         uses: actions/checkout@v3
         with:
           repository: tcltk/tcl
@@ -133,7 +138,7 @@ jobs:
         env:
           CFGOPT: --enable-64bit --enable-symbols=${{ matrix.symbols }}
         working-directory: tcl/win
-      - name: Configure (symbols=${{ matrix.symbols }})
+      - name: Configure Tk (symbols=${{ matrix.symbols }})
         run: |
           ./configure ${CFGOPT} "--prefix=$HOME/INSTALL_DIR" "--with-tcl=$TCL_CONFIG_PATH" || {
             cat config.log
@@ -142,13 +147,13 @@ jobs:
           }
         env:
           CFGOPT: --enable-64bit --enable-symbols=${{ matrix.symbols }}
-      - name: Build
+      - name: Build Tk
         run: |
           make all tktest || {
             echo "::error::Failure during Build"
             exit 1
           }
-      - name: Run Tests
+      - name: Run Tk Tests
         run: |
           make test-classic | tee out-classic.txt
           make test-ttk | tee out-ttk.txt
-- 
cgit v0.12