From 002f2704b5629c9046977f3470dab78d849444b4 Mon Sep 17 00:00:00 2001 From: Jason Naylor Date: Fri, 19 Sep 2025 12:24:05 -0700 Subject: [PATCH 1/2] Get base build artifacts into the release --- .github/workflows/base-installer-cd.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/base-installer-cd.yml b/.github/workflows/base-installer-cd.yml index 58f8b926da..e02f3d75e4 100644 --- a/.github/workflows/base-installer-cd.yml +++ b/.github/workflows/base-installer-cd.yml @@ -251,31 +251,33 @@ jobs: if: ${{ inputs.make_release == 'true' }} run: | [System.IO.Compression.ZipFile]::CreateFromDirectory( - "$pwd\BuildDir", - "$pwd\BuildDir.zip", + "${{ github.workspace }}\BuildDir", + "${{ github.workspace }}\BuildDir.zip", [System.IO.Compression.CompressionLevel]::Optimal, $false ) [System.IO.Compression.ZipFile]::CreateFromDirectory( - "$pwd\PatchableInstaller\ProcRunner\ProcRunner\bin\Release\net48", - "$pwd\ProcRunner.zip", + "${{ github.workspace }}\PatchableInstaller\ProcRunner\ProcRunner\bin\Release\net48", + "${{ github.workspace }}\ProcRunner.zip", [System.IO.Compression.CompressionLevel]::Optimal, $false ) + Get-ChildItem "${{ github.workspace }}" -Filter "*.zip" | Select-Object Name, Length + "build_dir_zip=$(("${{ github.workspace }}/BuildDir.zip") -replace '\\','/')" >> $env:GITHUB_OUTPUT + "proc_runner_zip=$(("${{ github.workspace }}/ProcRunner.zip") -replace '\\','/')" >> $env:GITHUB_OUTPUT + - name: Create Release and Upload artifacts if: ${{ inputs.make_release == 'true' }} - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 with: tag_name: build-${{ env.RELEASE_BASE_BUILD_NUMBER }} name: "FieldWorks Base Build #${{ env.RELEASE_BASE_BUILD_NUMBER }}" draft: false prerelease: true files: | - ${{ github.workspace }}/BuildDir.zip - ${{ github.workspace }}/ProcRunner.zip - ${{ steps.stage_installers.outputs.offline_exe }} - ${{ steps.stage_installers.outputs.online_exe }} + ${{ steps.prepare_paths.outputs.build_dir_zip }} + ${{ steps.prepare_paths.outputs.proc_runner_zip }} - name: Upload Build Logs uses: actions/upload-artifact@v4 From dacffbda648e58ae3dcaf1c6d54b4a9df52a2d76 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Fri, 19 Sep 2025 15:36:48 -0700 Subject: [PATCH 2/2] Fix GitHub release task: add fail_on_unmatched_files parameter and correct file upload paths (#467) * Fix GitHub release task: add fail_on_unmatched_files and fix file path references Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: jasonleenaylor <2295227+jasonleenaylor@users.noreply.github.com> --- .github/workflows/base-installer-cd.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/base-installer-cd.yml b/.github/workflows/base-installer-cd.yml index e02f3d75e4..912f169d1b 100644 --- a/.github/workflows/base-installer-cd.yml +++ b/.github/workflows/base-installer-cd.yml @@ -248,6 +248,7 @@ jobs: Write-Host "Uploaded online installer to s3://flex-updates/$onlineS3Key" - name: Compress Build Artifacts + id: compress_artifacts if: ${{ inputs.make_release == 'true' }} run: | [System.IO.Compression.ZipFile]::CreateFromDirectory( @@ -275,9 +276,10 @@ jobs: name: "FieldWorks Base Build #${{ env.RELEASE_BASE_BUILD_NUMBER }}" draft: false prerelease: true + fail_on_unmatched_files: true files: | - ${{ steps.prepare_paths.outputs.build_dir_zip }} - ${{ steps.prepare_paths.outputs.proc_runner_zip }} + ${{ steps.compress_artifacts.outputs.build_dir_zip }} + ${{ steps.compress_artifacts.outputs.proc_runner_zip }} - name: Upload Build Logs uses: actions/upload-artifact@v4