Run Windows build on Windows 2022 runner

Jay Berkenbilt
1 parent 6b114684
Showing 4 changed files with 10 additions and 7 deletions
.github/workflows/main.yml
ChangeLog
build-scripts/build-windows
build-scripts/build-windows.bat
@@ -54,7 +54,7 @@ jobs:
           name: distribution
           path: distribution
   Windows:
-    runs-on: windows-2019
+    runs-on: windows-latest
     needs: Prebuild
     strategy:
       fail-fast: false
@@ -2,6 +2,11 @@
  
 	* 10.6.3: release
  
+	* Use Windows 2022 github runners and therefore Visual Studio 2022
+	to create Windows distributions
+
+	* Fix DLL export issue with mingw (Windows)
+
 2022-03-07  Jay Berkenbilt  <ejb@ql.org>
  
 	* Minor internal changes to assist with building in other
@@ -6,16 +6,14 @@ tool=$2
  
 if [[ $tool == mingw ]]; then
     pacman -Sy --noconfirm make base-devel tar zip unzip
-    if [ -d /c/msys64 ]; then
-        PATH="/c/msys64/mingw$wordsize/bin:$PATH"
-    else
+    if [ ! -x /c/msys64/mingw$wordsize/bin/g++.exe ]; then
         if [[ $wordsize == 64 ]]; then
             pacman -Sy --noconfirm mingw-w64-x86_64-toolchain
         else
             pacman -Sy --noconfirm mingw-w64-i686-toolchain
         fi
-        PATH="/c/tools/msys64/mingw$wordsize/bin:$PATH"
     fi
+    PATH="/c/msys64/mingw$wordsize/bin:$PATH"
     g++ -v
 elif [[ $tool == msvc ]]; then
     cl
@@ -3,9 +3,9 @@
 setlocal ENABLEDELAYEDEXPANSION
 if %2 == msvc (
     if %1 == 64 (
-       call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+       call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
     ) else (
-       call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
+       call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
     )
     choco install zip
     bash ./build-scripts/build-windows %1 %2