Merge 03a0e92 into a5874b9

seanbudd · web-flow · commit f37e780f7aea · 2025-05-07T15:41:03.000+08:00
diff --git a/.github/workflows/testAndPublish.yml b/.github/workflows/testAndPublish.yml
@@ -37,7 +37,7 @@ env:
   feature_buildSymbols: configured
   feature_uploadSymbolsToMozilla: configured
   feature_crowdinSync: configured
-  # feature_signing: configured
+  feature_signing: configured
   # feature_buildAppx: configured
 
 jobs:
@@ -197,7 +197,12 @@ jobs:
       run: ci/scripts/setBuildVersionVars.ps1
     - name: Set scons args
       run: ci/scripts/setSconsArgs.ps1
-    - name: Prepare source code for launcher
+      env:
+        apiSigningToken: ${{ (github.event_name == 'push' && env.feature_signing) && secrets.API_SIGNING_TOKEN || '' }}
+    - name: Install SignPath
+      if: ${{ github.event_name == 'push' && env.feature_signing }}
+      run: Install-Module -Name SignPath -Force
+    - name: Create launcher
       shell: cmd
       run: scons %sconsOutTargets% %sconsArgs% ${{ !runner.debug && '--all-cores' || '-j1'}}
     - name: Upload launcher
diff --git a/appveyor/scripts/sign.ps1 b/appveyor/scripts/sign.ps1
@@ -8,4 +8,5 @@ param(
     [string]$FileToSign
 )
 
+Import-Module -Name SignPath
 Submit-SigningRequest -ApiToken $ApiToken -InputArtifactPath $FileToSign -OutputArtifactPath $FileToSign -OrganizationId "12147e94-bba9-4fef-b29b-300398e90c5a" -ProjectSlug "NVDA" -SigningPolicySlug "release_signing_policy" -WaitForCompletion -Force
diff --git a/ci/scripts/setSconsArgs.ps1 b/ci/scripts/setSconsArgs.ps1
@@ -11,7 +11,8 @@ if ($env:versionType) {
 	$sconsArgs += " updateVersionType=$env:versionType"
 }
 $sconsArgs += " publisher=`"$env:scons_publisher`""
-if ($env:GITHUB_EVENT_NAME -eq "push" -and $env:feature_signing) {
+if ($env:GITHUB_EVENT_NAME -eq "push" -and $env:feature_signing -and $env:apiSigningToken) {
+	# Note must be a single line variable
 	$sconsArgs += " apiSigningToken=$env:apiSigningToken"
 }
 $sconsArgs += " version_build=$([int]$env:GITHUB_RUN_NUMBER + [int]$env:START_BUILD_NUMBER)"

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,5 @@ param(`
`8`	`8`	`[string]$FileToSign`
`9`	`9`	`)`
`10`	`10`
	`11`	`+Import-Module -Name SignPath`
`11`	`12`	`Submit-SigningRequest -ApiToken $ApiToken -InputArtifactPath $FileToSign -OutputArtifactPath $FileToSign -OrganizationId "12147e94-bba9-4fef-b29b-300398e90c5a" -ProjectSlug "NVDA" -SigningPolicySlug "release_signing_policy" -WaitForCompletion -Force`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@ if ($env:versionType) {`
`11`	`11`	`$sconsArgs += " updateVersionType=$env:versionType"`
`12`	`12`	`}`
`13`	`13`	$sconsArgs += " publisher=`"$env:scons_publisher`""
`14`		`-if ($env:GITHUB_EVENT_NAME -eq "push" -and $env:feature_signing) {`
	`14`	`+if ($env:GITHUB_EVENT_NAME -eq "push" -and $env:feature_signing -and $env:apiSigningToken) {`
	`15`	`+ # Note must be a single line variable`
`15`	`16`	`$sconsArgs += " apiSigningToken=$env:apiSigningToken"`
`16`	`17`	`}`
`17`	`18`	`$sconsArgs += " version_build=$([int]$env:GITHUB_RUN_NUMBER + [int]$env:START_BUILD_NUMBER)"`