From 5385c9ced1b281a6f23f6cb69a67dc4b034b7884 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 24 Aug 2021 17:53:15 +0200
Subject: [PATCH] Add DLL Release wxMSW CI build

Append the path to the directory containing the DLLs to PATH to allow
the tests to find them.

Also quote the value of the "Configuration" property as it may (and
does) contain spaces.
---
 .github/workflows/ci_msw.yml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci_msw.yml b/.github/workflows/ci_msw.yml
index bcaef8be85..13407e3a34 100644
--- a/.github/workflows/ci_msw.yml
+++ b/.github/workflows/ci_msw.yml
@@ -44,13 +44,15 @@ on:
 jobs:
   msw-vs2019:
     runs-on: windows-2019
-    name: wxMSW vs2019 ${{ matrix.configuration }}/${{ matrix.platform }}
+    name: wxMSW vs2019 ${{ matrix.configuration }} ${{ matrix.platform }}
     strategy:
       fail-fast: false
       matrix:
         include:
           - configuration: 'Debug'
             platform: 'Win32'
+          - configuration: 'DLL Release'
+            platform: 'x64'
 
     steps:
       - name: Checkout
@@ -63,15 +65,20 @@ jobs:
 
       - name: Build
         run: |
-            msbuild /noLogo /m /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }} build\msw\wx_vc16.sln
+            msbuild /noLogo /m '/p:Configuration=${{ matrix.configuration }}' /p:Platform=${{ matrix.platform }} build\msw\wx_vc16.sln
+            if ( '${{ matrix.configuration }}'.IndexOf('DLL') -ne -1 ) {
+                $dlldir = Join-Path (Get-Location) 'lib\vc_${{ matrix.platform }}_dll'
+                Write-Output "Adding $dlldir to the PATH"
+                $dlldir | Out-File -Append $env:GITHUB_PATH
+            }
 
       - name: Build minimal sample
         run: |
-            msbuild /noLogo /m /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }} samples\minimal\minimal_vc16.sln
+            msbuild /noLogo /m '/p:Configuration=${{ matrix.configuration }}' /p:Platform=${{ matrix.platform }} samples\minimal\minimal_vc16.sln
 
       - name: Build tests
         run: |
-            msbuild /noLogo /m /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }} tests\test_vc16.sln
+            msbuild /noLogo /m '/p:Configuration=${{ matrix.configuration }}' /p:Platform=${{ matrix.platform }} tests\test_vc16.sln
 
       - name: Run tests
         working-directory: tests
@@ -80,7 +87,7 @@ jobs:
 
       - name: Build GUI tests
         run: |
-            msbuild /noLogo /m /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }} tests\test_gui_vc16.sln
+            msbuild /noLogo /m '/p:Configuration=${{ matrix.configuration }}' /p:Platform=${{ matrix.platform }} tests\test_gui_vc16.sln
 
       - name: Run GUI tests
         working-directory: tests