11name : Patch Installer
22on :
33 push :
4- branches : ["release/9.3", "feature/gha-cd" ]
4+ branches : ["release/9.3"]
55 workflow_dispatch :
66 inputs :
77 fw_ref :
@@ -253,7 +253,9 @@ jobs:
253253 BASE_BUILD_NUMBER : ${{ inputs.base_build_number }}
254254 BUILD_VERSION_SEGMENT : ${{ env.BuildVersionSegment }}
255255 run : |
256- # --- Decide baseBuildNumber (_b###) ---
256+ # The github action base-installer-cd will make releases with a tag build-[build number]
257+ # manually created releases with Jenkins artifacts need to use existing tags so we need
258+ # to specify the base build number when we launch patches against Jenkins releases
257259 if ($env:BASE_BUILD_NUMBER -and $env:BASE_BUILD_NUMBER.Trim() -ne "") {
258260 $baseBuildNumber = "_b$($env:BASE_BUILD_NUMBER)"
259261 } elseif ($env:BASE_RELEASE -and $env:BASE_RELEASE.Trim() -ne "") {
@@ -264,28 +266,19 @@ jobs:
264266 } else {
265267 throw "Must have a base_build_number nor a valid base_release to support automatic updating"
266268 }
267-
268- # --- Locate patch file ---
269269 $patchPath = "${{ steps.find_patch.outputs.patch_file }}"
270270 if (-not (Test-Path $patchPath)) {
271271 throw "Patch file not found at $patchPath"
272272 }
273-
274273 $patchFile = Split-Path $patchPath -Leaf
275274 $patchDir = Split-Path $patchPath -Parent
276-
277- # --- Insert baseBuildNumber before _x64.msp necessary for Automatic Update code Src\Common\FwUtils\FwUpdater.cs---
275+ # Insert baseBuildNumber before _x64.msp necessary for Automatic Update code Src\Common\FwUtils\FwUpdater.cs
278276 if ($patchFile -notmatch '^(.*)(_x64\.msp)$') {
279277 throw "Unexpected patch filename format: $patchFile"
280278 }
281279 $patchWithBaseInName = "$($Matches[1])${baseBuildNumber}$($Matches[2])"
282-
283- Write-Host "Renaming $patchFile -> $patchWithBaseInName"
284-
285- # --- Upload to S3 ---
286280 $s3Key = "flex-updates/jobs/FieldWorks-Win-all-Release-Patch/$($env:BUILD_VERSION_SEGMENT)/$patchWithBaseInName"
287281 aws s3 cp $patchPath "s3://flex-updates/$s3Key"
288-
289282 Write-Host "Uploaded to s3://flex-updates/$s3Key"
290283
291284 - name : Upload Build Logs
@@ -297,4 +290,3 @@ jobs:
297290 path : |
298291 Build/*.log
299292 Build/*.binlog
300- BuildDir/*.msp
0 commit comments