Simplify MSVC setup inside action

Author: molinav

.github/actions/setup-msvc/action.yml

@@ -23,24 +23,19 @@ runs:
             exit 1;
         }
         Invoke-WebRequest ${{ env.VS090URL }} -OutFile VCForPython27.msi
-        $msi_process = Start-Process "msiexec" -ArgumentList "/i VCForPython27.msi /qn /l*! output.log" -NoNewWindow -PassThru
+        $msi_process = Start-Process "msiexec" -NoNewWindow -PassThru         `
+            -ArgumentList "/i VCForPython27.msi /qn /l*! output.log"
         $msi_process.WaitForExit()
-        if ("${{ inputs.arch }}" -eq "x64") {
-            $vcsubdir = "amd64"
-            $winsdksubdir = "${{ inputs.arch }}"
-        } else {
-            $vcsubdir = ""
-            $winsdksubdir = ""
+        $MSVCVARS = "VCINSTALLDIR", "WindowsSdkDir", "PATH", "LIB", "LIBPATH", "INCLUDE"
+        $env:MSVCROOT = "C:\Users\$env:UserName\AppData\Local\Programs\Common\Microsoft\Visual C++ for Python\9.0"
+        cmd.exe /c '"%MSVCROOT%\vcvarsall.bat" ${{ inputs.arch }} && set' |
+        foreach-object {
+            $name, $value = $_ -split '=', 2
+            if ($MSVCVARS -contains $name) {
+                echo $name $value
+                echo $_ >> $env:GITHUB_ENV
+            }
         }
-        $MSVCROOT = "C:\Users\$env:UserName\AppData\Local\Programs\Common\Microsoft\Visual C++ for Python\9.0"
-        $VCINSTALLDIR = "$MSVCROOT\VC"
-        $WindowsSdkDir = "$MSVCROOT\WinSDK"
-        echo VCINSTALLDIR="$VCINSTALLDIR" >> $env:GITHUB_ENV
-        echo WindowsSdkDir="$WindowsSdkDir" >> $env:GITHUB_ENV
-        echo PATH="$VCINSTALLDIR\Bin\$vcsubdir;$WindowsSdkDir\Bin\$winsdksubdir;$WindowsSdkDir\Bin;$env:PATH" >> $env:GITHUB_ENV
-        echo LIB="$VCINSTALLDIR\Lib\$vcsubdir;$WindowsSdkDir\Lib\$winsdksubdir;$env:LIB" >> $env:GITHUB_ENV
-        echo LIBPATH="$VCINSTALLDIR\Lib\$vcsubdir;$WindowsSdkDir\Lib\$winsdksubdir;$env:LIBPATH" >> $env:GITHUB_ENV
-        echo INCLUDE="$VCINSTALLDIR\Include;$WindowsSdkDir\Include;$env:INCLUDE" >> $env:GITHUB_ENV
       if: inputs.version == '9'
     -
       name: Set MSVC toolchain (v14+)

.github/workflows/basemap-data-hires.yml

@@ -4,7 +4,6 @@ env:
   PKGDIR: "packages/basemap_data_hires"
 
 on:
-  push:
   workflow_dispatch:
 
 jobs:

.github/workflows/basemap-data.yml

@@ -4,7 +4,6 @@ env:
   PKGDIR: "packages/basemap_data"
 
 on:
-  push:
   workflow_dispatch:
 
 jobs:

.github/workflows/basemap-for-manylinux.yml

@@ -4,7 +4,6 @@ env:
   PKGDIR: "packages/basemap"
 
 on:
-  push:
   workflow_dispatch:
 
 jobs: