Update Visual Studio setup for Windows build

shogo82148 · Jan 17, 2024 · bfbd971 · bfbd971
1 parent dfc3587
commit bfbd971
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 14 deletions.
diff --git a/.github/build-mysql-windows.ps1 b/.github/build-mysql-windows.ps1
@@ -14,22 +14,41 @@ $PREFIX = Join-Path $RUNNER_TOOL_CACHE "mysql" $MYSQL_VERSION "x64"
 
 $ACTION_VERSION = Get-Content (Join-Path $ROOT ".." "package.json") | jq -r ".version"
 
-Write-Host "::group::Set up Visual Studio 2022"
-New-Item $RUNNER_TEMP -ItemType Directory -Force
-Set-Location "$RUNNER_TEMP"
-Remove-Item -Path * -Recurse -Force
-
-# https://help.appveyor.com/discussions/questions/18777-how-to-use-vcvars64bat-from-powershell
-# https://stackoverflow.com/questions/2124753/how-can-i-use-powershell-with-the-visual-studio-command-prompt
-cmd.exe /c "call `"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat`" x64 && set > %temp%\vcvars.txt"
-Get-Content "$env:temp\vcvars.txt" | Foreach-Object {
-    if ($_ -match "^(.*?)=(.*)$") {
-        Set-Item -Path "env:$($matches[1])" $matches[2]
-        Write-Host "::debug::$($matches[1])=$($matches[2])"
+if (Test-Path "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat") {
+    Write-Host "::group::Set up Visual Studio 2022"
+    New-Item $RUNNER_TEMP -ItemType Directory -Force
+    Set-Location "$RUNNER_TEMP"
+    Remove-Item -Path * -Recurse -Force
+
+    # https://help.appveyor.com/discussions/questions/18777-how-to-use-vcvars64bat-from-powershell
+    # https://stackoverflow.com/questions/2124753/how-can-i-use-powershell-with-the-visual-studio-command-prompt
+    cmd.exe /c "call `"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat`" x64 && set > %temp%\vcvars.txt"
+    Get-Content "$env:temp\vcvars.txt" | Foreach-Object {
+        if ($_ -match "^(.*?)=(.*)$") {
+            Set-Item -Path "env:$($matches[1])" $matches[2]
+            Write-Host "::debug::$($matches[1])=$($matches[2])"
+        }
     }
+    Write-Host "::endgroup::"
 }
-Write-Host "::endgroup::"
 
+if (Test-Path "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat") {
+    Write-Host "::group::Set up Visual Studio 2019"
+    New-Item $RUNNER_TEMP -ItemType Directory -Force
+    Set-Location "$RUNNER_TEMP"
+    Remove-Item -Path * -Recurse -Force
+
+    # https://help.appveyor.com/discussions/questions/18777-how-to-use-vcvars64bat-from-powershell
+    # https://stackoverflow.com/questions/2124753/how-can-i-use-powershell-with-the-visual-studio-command-prompt
+    cmd.exe /c "call `"C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat`" x64 && set > %temp%\vcvars.txt"
+    Get-Content "$env:temp\vcvars.txt" | Foreach-Object {
+        if ($_ -match "^(.*?)=(.*)$") {
+            Set-Item -Path "env:$($matches[1])" $matches[2]
+            Write-Host "::debug::$($matches[1])=$($matches[2])"
+        }
+    }
+    Write-Host "::endgroup::"
+}
 
 # NASM is required by OpenSSL
 Write-Host "::group::Set up NASM"

diff --git a/.github/workflows/build-mysql.yml b/.github/workflows/build-mysql.yml
@@ -84,7 +84,7 @@ jobs:
           GITHUB_TOKEN: ${{ github.token }}
 
   build-windows:
-    runs-on: windows-2022
+    runs-on: ${{ startsWith(matrix.mysql, '5.') && 'windows-2019' || 'windows-2022' }}
     needs: list
     strategy:
       fail-fast: false