Skip to content

Commit 952953d

Browse files
authored
Group scons targets better (#18885)
Fixup of #18880 Summary of the issue: #18880 broke signed builds, as building the controller client requires signing, and #18880 tried to build the controller client without signpath installed. It also failed to fix #18867 properly, as the full user_docs was not built until scons launcher was called Description of user facing changes: None Description of developer facing changes: Fixed #18880 properly Description of development approach: Build all docs in a grouped job Build client & launcher in a separate job
1 parent 618032b commit 952953d

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

.github/workflows/testAndPublish.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -340,17 +340,17 @@ jobs:
340340
run: ci/scripts/setSconsArgs.ps1
341341
env:
342342
apiSigningToken: ${{ github.event_name == 'push' && secrets.API_SIGNING_TOKEN || '' }}
343-
- name: Build scons targets
343+
- name: Build scons docs targets
344344
shell: cmd
345-
run: scons %sconsOutTargets% %sconsArgs% %sconsCores%
346-
- name: Create launcher
345+
run: scons %sconsDocsOutTargets% %sconsArgs% %sconsCores%
346+
# Run launcher separately as we can't safely generate that in parallel to docs scons targets (#18867)
347+
- name: Create launcher and controller client
347348
shell: cmd
348-
# Run launcher separately as we can't safely generate that in parallel to other scons targets (#18867)
349349
run: |
350350
PowerShell -Command "Set-ExecutionPolicy Bypass"
351351
PowerShell -Command "Set-PSRepository PSGallery -InstallationPolicy Trusted"
352352
PowerShell -Command "Install-Module -Name SignPath -Force"
353-
scons launcher %sconsArgs% %sconsCores%
353+
scons %sconsLauncherOutTargets% %sconsArgs% %sconsCores%
354354
- name: Upload launcher
355355
id: uploadLauncher
356356
uses: actions/upload-artifact@v4

ci/scripts/setSconsArgs.ps1

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
$ErrorActionPreference = "Stop";
2-
$sconsOutTargets = "developerGuide changes userGuide keyCommands client moduleList"
2+
$sconsDocsOutTargets = "developerGuide changes userGuide keyCommands user_docs"
3+
$sconsLauncherOutTargets = "launcher client moduleList"
34
$sconsArgs = "version=$env:version"
45
$sconsCores = "--all-cores"
56
if ($env:RUNNER_DEBUG -eq "1") {
@@ -20,9 +21,11 @@ if ($env:GITHUB_EVENT_NAME -eq "push" -and $env:apiSigningToken) {
2021
$sconsArgs += " apiSigningToken=$env:apiSigningToken"
2122
}
2223
$sconsArgs += " version_build=$([int]$env:GITHUB_RUN_NUMBER + [int]$env:START_BUILD_NUMBER)"
23-
Write-Output "sconsOutTargets=$sconsOutTargets" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
24+
Write-Output "sconsDocsOutTargets=$sconsDocsOutTargets" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
25+
Write-Output "sconsLauncherOutTargets=$sconsLauncherOutTargets" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
2426
Write-Output "sconsArgs=$sconsArgs" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
2527
Write-Output "sconsCores=$sconsCores" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
2628
Write-Host "scons args: $sconsArgs"
27-
Write-Host "scons output targets: $sconsOutTargets"
29+
Write-Host "scons docs output targets: $sconsDocsOutTargets"
30+
Write-Host "scons launcher output targets: $sconsLauncherOutTargets"
2831
Write-Host "scons cores: $sconsCores"

0 commit comments

Comments
 (0)