Merge pull request #3 from humbletim/windows-2022-test

improved Windows 2022 SDK detection and fallback support

Author: humbletim

.github/workflows/ci.yml

@@ -1,20 +1,45 @@
 name: test vsdevenv-shell
 on:
   push:
+  workflow_dispatch:
+      inputs:
+        extra_tests:
+          description: 'Enable additional CI settings'
+          required: false
+          default: false
 jobs:
   test-vsdevenv-shell:
-    runs-on: windows-latest
+    strategy:
+      matrix:
+        os: [ windows-2019, windows-2022, ubuntu-latest, macOS-latest ]
+    runs-on: ${{ matrix.os }}
     steps:
+      - name: set VISUAL_STUDIO_GENERATOR
+        if: ${{ runner.os == 'Windows' }}
+        shell: bash
+        run: |
+          if grep 2019 /c/imagedata.json ; then
+            echo "VISUAL_STUDIO_GENERATOR=Visual Studio 16 2019" | tee -a $GITHUB_ENV
+          else #if grep 2019 /c/imagedata.json ; 
+            echo "VISUAL_STUDIO_GENERATOR=Visual Studio 17 2022" | tee -a $GITHUB_ENV
+          fi
       - uses: actions/checkout@v2
       - uses: ./
 
+      - name: Setup tmate session
+        if: ${{ contains(github.event.inputs.extra_tests, format('tmate-{0}', runner.os)) }}
+        uses: mxschmitt/[email protected]
+        with:
+          limit-access-to-actor: true
+
       - name: an earlier build step
         shell: bash
         run: |
           echo "clean job environment (no dev tools)"
           echo "$(env | wc -l) environment variables defined"
 
       - name: specific step (executed within vsdevcmd.bat environment)
+        continue-on-error: ${{ runner.os != 'Windows' }}
         shell: vsdevenv x64 bash {0}
         run: |
           echo "$(env | wc -l) environment variables defined"
@@ -32,22 +57,27 @@ jobs:
         run: echo test 1 2 3
 
       - name: Verify MSVC wrapper -- bash
+        continue-on-error: ${{ runner.os != 'Windows' }}
         shell: vsdevenv x64 bash {0}
         run: cl
 
       - name: Verify MSVC wrapper -- cmd
+        continue-on-error: ${{ runner.os != 'Windows' }}
         shell: vsdevenv x86 cmd {0}
         run: cl
 
       - name: Verify MSVC wrapper -- powershell
+        continue-on-error: ${{ runner.os != 'Windows' }}
         shell: vsdevenv arm64 powershell {0}
         run: cl
 
       - name: Verify MSVC wrapper -- pwsh
+        continue-on-error: ${{ runner.os != 'Windows' }}
         shell: vsdevenv arm64 pwsh {0}
         run: cl
 
       - name: cmake test -- vsdevenv x64 cmd 
+        continue-on-error: ${{ runner.os != 'Windows' }}
         shell: vsdevenv x64 cmd {0}
         run: |
           cmake -G "NMake Makefiles" -B tests\build-x64 -S tests -DCMAKE_BUILD_TYPE=Release -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=. || exit /b %errorlevel%
@@ -56,14 +86,16 @@ jobs:
           tests\build-x64\helloworld.exe 1 2 3 4
 
       - name: cmake test -- vsdevenv x64 bash -A x64
+        continue-on-error: ${{ runner.os != 'Windows' }}
         shell: vsdevenv x64 bash {0}
         run: |
-          cmake -A x64 -G "Visual Studio 16 2019" -B tests/build-Ax64 -S tests -DCMAKE_BUILD_TYPE=Release -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=.
+          cmake -A x64 -G "$VISUAL_STUDIO_GENERATOR" -B tests/build-Ax64 -S tests -DCMAKE_BUILD_TYPE=Release -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=.
           cmake --build tests/build-Ax64 --config release
           ls -l tests/build-Ax64/helloworld.exe
           ./tests/build-Ax64/helloworld.exe 1 2 3 4
 
       - name: cmake test -- vsdevenv x86 powershell
+        continue-on-error: ${{ runner.os != 'Windows' }}
         shell: vsdevenv x86 powershell {0}
         run: |
           cmake -G "NMake Makefiles" -B tests\build-x86 -S tests -DCMAKE_BUILD_TYPE=Release -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=.
@@ -72,9 +104,10 @@ jobs:
           tests\build-x86\helloworld.exe 1 2 3 4
 
       - name: cmake test -- vsdevenv x86 cmd -A Win32
+        continue-on-error: ${{ runner.os != 'Windows' }}
         shell: vsdevenv x86 cmd {0}
         run: |
-          cmake -A Win32 -G "Visual Studio 16 2019" -B tests\build-Ax86 -S tests -DCMAKE_BUILD_TYPE=Release -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=. || exit /b %errorlevel%
+          cmake -A Win32 -G "$VISUAL_STUDIO_GENERATOR" -B tests\build-Ax86 -S tests -DCMAKE_BUILD_TYPE=Release -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=. || exit /b %errorlevel%
           cmake --build tests\build-Ax86 --config release || exit /b %errorlevel%
           dir tests\build-Ax86\helloworld.exe
           tests\build-Ax86\helloworld.exe 1 2 3 4

action.yml

@@ -10,7 +10,22 @@ runs:
       shell: bash
       run: |
         if [[ $RUNNER_OS == 'Windows' ]] ; then
-          echo $GITHUB_ACTION_PATH/bin >> $GITHUB_PATH
+          echo $GITHUB_ACTION_PATH/bin | tee -a $GITHUB_PATH
         else
-          echo "NOTE: skipping vsdevenv-shell integration (RUNNER_OS is $RUNNER_OS, not Windows)"
+          echo "NOTE: emulating vsdevenv-shell integration (since RUNNER_OS is $RUNNER_OS, not Windows)"
+          echo $GITHUB_ACTION_PATH/bin | tee -a $GITHUB_PATH
+          cat<<-'EOF' > $GITHUB_ACTION_PATH/bin/vsdevenv
+        #!/bin/bash
+        set -e
+        shift # x86
+        subshell=$1
+        shift # subshell
+        case $subshell in
+          bash) bash --noprofile --norc -e -o pipefail "$1" ;;
+          pwsh|powershell) pwsh -command "\$ErrorActionPreference = 'stop' ; get-content '$1' | Invoke-Expression ; if ((Test-Path -LiteralPath variable:\\LASTEXITCODE)) { exit \$LASTEXITCODE }" ;;
+          *) echo "skipping subshell=$subshell on $RUNNER_OS" ; exit 0 ;;
+        esac
+        EOF
+          chmod a+x $GITHUB_ACTION_PATH/bin/vsdevenv
+          cat $GITHUB_ACTION_PATH/bin/vsdevenv
         fi

bin/vsdevenv.cmd

@@ -1,7 +1,8 @@
 @echo off
 @setlocal
 @FOR /F "tokens=*" %%g IN ('"bash %~dp0\..\utils\findvsdevcmd.sh"') do (SET vsdevcmd=%%g)
-echo [vsdevcmd] arch=%1 shell=%2 script=%3 vsdevcmd=%vsdevcmd% 
+echo [vsdevcmd] arch=%1 shell=%2 script=%3 vsdevcmd=%vsdevcmd%
+if "%vsdevcmd%" == "" ( echo "ERROR: could not locate vsdevcmd.bat" & exit /b 200 )
 @call %vsdevcmd% -no_logo -arch=%1 -host_arch=amd64
 @FOR /F "tokens=*" %%g IN ('"bash %~dp0\..\utils\findmlexepath.sh"') do (SET msvc_mlpath=%%g)
 @REM echo [vsdevcmd] arch=%1 shell=%2 script=%3 msvc_mlpath=%msvc_mlpath% 

utils/findvsdevcmd.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-cygpath -ms /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/*/*/Common7/Tools/vsdevcmd.bat|sort -r|head -1
+cygpath -ms /c/Program\ File*/Microsoft\ Visual\ Studio/*/*/Common7/Tools/vsdevcmd.bat|sort -r|head -1