Allow to pass PREMAKE_OPTS to Bootstrap.bat

[CI] add Visual studio with clang

Author: Jarod42

.github/workflows/ci-workflow.yml

@@ -65,6 +65,7 @@ jobs:
         config: [debug, release]
         platform: [Win32, x64]
         msdev: [vs2022]
+        cc: [msc, clang]
     timeout-minutes: 15
     steps:
     - name: Checkout
@@ -74,15 +75,15 @@ jobs:
       env:
         PLATFORM: ${{ matrix.platform }}
         CONFIG: ${{ matrix.config }}
-      run: ./Bootstrap.bat ${{ matrix.msdev }}
+      run: ./Bootstrap.bat ${{ matrix.msdev }} "PREMAKE_OPTS=--cc=${{ matrix.cc }}"
     - name: Test
       run: bin\${{ matrix.config }}\premake5 test --test-all
       shell: cmd
     - name: Docs check
       run: bin\${{ matrix.config }}\premake5 docs-check
       shell: cmd
     - name: Upload Artifacts
-      if: matrix.config == 'release'
+      if: matrix.config == 'release' && matrix.cc == 'msc'
       uses: actions/upload-artifact@v4
       with:
         name: premake-windows-${{ matrix.platform }}

Bootstrap.bat

@@ -26,6 +26,8 @@ IF "%vsversion%" == "" (
 	EXIT /B %ERRORLEVEL%
 )
 
+SET PREMAKE_OPTS=%2
+
 IF "%vsversion%" == "vs2010" (
 	CALL :LegacyVisualBootstrap "%vsversion%" "100"
 
@@ -39,13 +41,13 @@ IF "%vsversion%" == "vs2010" (
 	CALL :LegacyVisualBootstrap "%vsversion%" "140"
 
 ) ELSE IF "%vsversion%" == "vs2017" (
-	CALL :VsWhereVisualBootstrap "%vsversion%" "15.0" "16.0"
+	CALL :VsWhereVisualBootstrap "%vsversion%" "15.0" "16.0" %PREMAKE_OPTS%
 
 ) ELSE IF "%vsversion%" == "vs2019" (
-	CALL :VsWhereVisualBootstrap "%vsversion%" "16.0" "17.0"
+	CALL :VsWhereVisualBootstrap "%vsversion%" "16.0" "17.0" %PREMAKE_OPTS%
 
 ) ELSE IF "%vsversion%" == "vs2022" (
-	CALL :VsWhereVisualBootstrap "%vsversion%" "17.0" "18.0"
+	CALL :VsWhereVisualBootstrap "%vsversion%" "17.0" "18.0" %PREMAKE_OPTS%
 
 ) ELSE (
 	ECHO Unrecognized Visual Studio version %vsversion%
@@ -93,6 +95,7 @@ REM %3: VisualStudio-style VSversionMax -> ex: 16.0
 SET "PremakeVsVersion=%~1"
 SET "VsVersionMin=%~2"
 SET "VsVersionMax=%~3"
+SET PREMAKE_OPTS=%4
 
 REM ref: https://github.com/Microsoft/vswhere/wiki/Start-Developer-Command-Prompt
 
@@ -104,13 +107,12 @@ IF NOT EXIST %VsWherePath% (
 SET VsWhereCmdLine="!VsWherePath! -nologo -latest -version [%VsVersionMin%,%VsVersionMax%) -property installationPath"
 
 FOR /F "usebackq delims=" %%i in (`!VsWhereCmdLine!`) DO (
-
 	IF EXIST "%%i\VC\Auxiliary\Build\vcvars64.bat" (
-		CALL "%%i\VC\Auxiliary\Build\vcvars64.bat" && nmake MSDEV="%PremakeVsVersion%" %PlatformArg% %ConfigArg% -f Bootstrap.mak windows
+		CALL "%%i\VC\Auxiliary\Build\vcvars64.bat" && nmake MSDEV="%PremakeVsVersion%" %PlatformArg% %ConfigArg%  %PREMAKE_OPTS% -f Bootstrap.mak windows
 		EXIT /B %ERRORLEVEL%
 	) ELSE (
 		IF EXIST "%%i\VC\Auxiliary\Build\vcvars32.bat" (
-			CALL "%%i\VC\Auxiliary\Build\vcvars32.bat" && nmake MSDEV="%PremakeVsVersion%" %PlatformArg% %ConfigArg% -f Bootstrap.mak windows
+			CALL "%%i\VC\Auxiliary\Build\vcvars32.bat" && nmake MSDEV="%PremakeVsVersion%" %PlatformArg% %ConfigArg% %PREMAKE_OPTS% -f Bootstrap.mak windows
 			EXIT /B %ERRORLEVEL%
 		)
 	)