beta to master (#18886)

Author: seanbudd

.github/workflows/testAndPublish.yml

@@ -338,17 +338,17 @@ jobs:
       run: ci/scripts/setSconsArgs.ps1
       env:
         apiSigningToken: ${{ github.event_name == 'push' && secrets.API_SIGNING_TOKEN || '' }}
-    - name: Build scons targets
+    - name: Build scons docs targets
       shell: cmd
-      run: scons %sconsOutTargets% %sconsArgs% %sconsCores%
-    - name: Create launcher
+      run: scons %sconsDocsOutTargets% %sconsArgs% %sconsCores%
+    # Run launcher separately as we can't safely generate that in parallel to docs scons targets (#18867)
+    - name: Create launcher and controller client
       shell: cmd
-      # Run launcher separately as we can't safely generate that in parallel to other scons targets (#18867)
       run: |
         PowerShell -Command "Set-ExecutionPolicy Bypass"
         PowerShell -Command "Set-PSRepository PSGallery -InstallationPolicy Trusted"
         PowerShell -Command "Install-Module -Name SignPath -Force"
-        scons launcher %sconsArgs% %sconsCores%
+        scons %sconsLauncherOutTargets% %sconsArgs% %sconsCores%
     - name: Upload launcher
       id: uploadLauncher
       uses: actions/upload-artifact@v4

ci/scripts/setSconsArgs.ps1

@@ -1,5 +1,6 @@
 $ErrorActionPreference = "Stop";
-$sconsOutTargets = "developerGuide changes userGuide keyCommands client moduleList"
+$sconsDocsOutTargets = "developerGuide changes userGuide keyCommands user_docs"
+$sconsLauncherOutTargets = "launcher client moduleList"
 $sconsArgs = "version=$env:version"
 $sconsCores = "--all-cores"
 if ($env:RUNNER_DEBUG -eq "1") {
@@ -20,9 +21,11 @@ if ($env:GITHUB_EVENT_NAME -eq "push" -and $env:apiSigningToken) {
 	$sconsArgs += " apiSigningToken=$env:apiSigningToken"
 }
 $sconsArgs += " version_build=$([int]$env:GITHUB_RUN_NUMBER + [int]$env:START_BUILD_NUMBER)"
-Write-Output "sconsOutTargets=$sconsOutTargets" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+Write-Output "sconsDocsOutTargets=$sconsDocsOutTargets" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+Write-Output "sconsLauncherOutTargets=$sconsLauncherOutTargets" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 Write-Output "sconsArgs=$sconsArgs" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 Write-Output "sconsCores=$sconsCores" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 Write-Host "scons args: $sconsArgs"
-Write-Host "scons output targets: $sconsOutTargets"
+Write-Host "scons docs output targets: $sconsDocsOutTargets"
+Write-Host "scons launcher output targets: $sconsLauncherOutTargets"
 Write-Host "scons cores: $sconsCores"