From b4073666daa0ec175f5183abceaa452e9ca7e990 Mon Sep 17 00:00:00 2001 From: Fabrice de Gans Date: Mon, 21 Apr 2025 15:42:23 +0200 Subject: [PATCH 1/3] Tools: Set `productArchitecture` in Package job --- .github/workflows/swift-toolchain.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/swift-toolchain.yml b/.github/workflows/swift-toolchain.yml index 4d909b9e8..f6d9482a7 100644 --- a/.github/workflows/swift-toolchain.yml +++ b/.github/workflows/swift-toolchain.yml @@ -3815,6 +3815,7 @@ jobs: -p:ImageRoot=${{ github.workspace }}/BuildRoot/Library/Developer ` -p:WORKAROUND_MIMALLOC_ISSUE_997=$WORKAROUND_MIMALLOC_ISSUE_997 ` -p:ProductVersion=${{ inputs.swift_version }} ` + -p:ProductArchitecture=${{ matrix.arch }} ` ${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/bld/bld.wixproj - name: Package CLI Tools From d3c760711fdf04f7716f65e48ec4e3b7f83a73ae Mon Sep 17 00:00:00 2001 From: Fabrice de Gans Date: Mon, 21 Apr 2025 19:09:51 +0200 Subject: [PATCH 2/3] Add ProductArchitecture in more steps --- .github/workflows/swift-toolchain.yml | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/.github/workflows/swift-toolchain.yml b/.github/workflows/swift-toolchain.yml index f6d9482a7..f19e2ae24 100644 --- a/.github/workflows/swift-toolchain.yml +++ b/.github/workflows/swift-toolchain.yml @@ -3828,6 +3828,7 @@ jobs: -p:PASSPHRASE=${{ secrets.PASSPHRASE }} ` -p:ImageRoot=${{ github.workspace }}/BuildRoot/Library/Developer ` -p:ProductVersion=${{ inputs.swift_version }} ` + -p:ProductArchitecture=${{ matrix.arch }} ` ${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/cli/cli.wixproj - name: Package Debugging Tools @@ -3840,6 +3841,7 @@ jobs: -p:PASSPHRASE=${{ secrets.PASSPHRASE }} ` -p:ImageRoot=${{ github.workspace }}/BuildRoot/Library/Developer ` -p:ProductVersion=${{ inputs.swift_version }} ` + -p:ProductArchitecture=${{ matrix.arch }} ` ${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/dbg/dbg.wixproj - name: Package IDE Tools @@ -3852,6 +3854,7 @@ jobs: -p:PASSPHRASE=${{ secrets.PASSPHRASE }} ` -p:ImageRoot=${{ github.workspace }}/BuildRoot/Library/Developer ` -p:ProductVersion=${{ inputs.swift_version }} ` + -p:ProductArchitecture=${{ matrix.arch }} ` ${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/ide/ide.wixproj - name: Package Runtime @@ -3875,26 +3878,26 @@ jobs: with: name: Windows-${{ matrix.arch }}-bld-msi path: | - ${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/bld.msi - ${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/bld.cab + ${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/bld.msi + ${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/bld.cab - uses: actions/upload-artifact@v4 with: name: Windows-${{ matrix.arch }}-cli-msi path: | - ${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/cli.msi - ${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/cli.cab + ${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/cli.msi + ${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/cli.cab - uses: actions/upload-artifact@v4 with: name: Windows-${{ matrix.arch }}-dbg-msi path: | - ${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/dbg.msi - ${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/dbg.cab + ${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/dbg.msi + ${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/dbg.cab - uses: actions/upload-artifact@v4 with: name: Windows-${{ matrix.arch }}-ide-msi path: | - ${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/ide.msi - ${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/ide.cab + ${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/ide.msi + ${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/ide.cab - uses: actions/upload-artifact@v4 with: @@ -4047,6 +4050,7 @@ jobs: -p:PASSPHRASE=${{ secrets.PASSPHRASE }} ` -p:ImageRoot=${{ github.workspace }}/BuildRoot/Library/Developer ` -p:ProductVersion=${{ inputs.swift_version }} ` + -p:ProductArchitecture=${{ inputs.build_arch }} ` -p:WindowsArchitectures="`"aarch64;i686;x86_64`"" ` -p:WindowsRuntimeARM64="${{ github.workspace }}/BuildRoot/Library/Developer/Runtimes/Windows-aarch64" ` -p:WindowsRuntimeX64="${{ github.workspace }}/BuildRoot/Library/Developer/Runtimes/Windows-x86_64" ` @@ -4067,19 +4071,19 @@ jobs: with: name: Windows-amd64-rtl-msm path: | - ${{ github.workspace }}/BinaryCache/installer/Release/amd64/rtl.amd64.msm + ${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/rtl.amd64.msm - uses: actions/upload-artifact@v4 with: name: Windows-arm64-rtl-msm path: | - ${{ github.workspace }}/BinaryCache/installer/Release/arm64/rtl.arm64.msm + ${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/rtl.arm64.msm - uses: actions/upload-artifact@v4 with: name: Windows-x86-rtl-msm path: | - ${{ github.workspace }}/BinaryCache/installer/Release/x86/rtl.x86.msm + ${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/rtl.x86.msm package_android_platform: # TODO: Build this on macOS or make an equivalent Mac-only job @@ -4235,6 +4239,7 @@ jobs: -p:PASSPHRASE=${{ secrets.PASSPHRASE }} ` -p:ImageRoot=${{ github.workspace }}/BuildRoot/Library ` -p:ProductVersion=${{ inputs.swift_version }} ` + -p:ProductArchitecture=${{ inputs.build_arch }} ` -p:AndroidArchitectures="`"x86_64;aarch64;i686;armv7`"" ` ${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/platforms/android/android.wixproj From 9f16273c8afb73e794e4f61dd0b359487f9313a1 Mon Sep 17 00:00:00 2001 From: Fabrice de Gans Date: Mon, 21 Apr 2025 19:44:30 +0200 Subject: [PATCH 3/3] Revert the per-architecture rtl package paths --- .github/workflows/swift-toolchain.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/swift-toolchain.yml b/.github/workflows/swift-toolchain.yml index f19e2ae24..cdc17302f 100644 --- a/.github/workflows/swift-toolchain.yml +++ b/.github/workflows/swift-toolchain.yml @@ -4071,19 +4071,19 @@ jobs: with: name: Windows-amd64-rtl-msm path: | - ${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/rtl.amd64.msm + ${{ github.workspace }}/BinaryCache/installer/Release/amd64/rtl.amd64.msm - uses: actions/upload-artifact@v4 with: name: Windows-arm64-rtl-msm path: | - ${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/rtl.arm64.msm + ${{ github.workspace }}/BinaryCache/installer/Release/arm64/rtl.arm64.msm - uses: actions/upload-artifact@v4 with: name: Windows-x86-rtl-msm path: | - ${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/rtl.x86.msm + ${{ github.workspace }}/BinaryCache/installer/Release/x86/rtl.x86.msm package_android_platform: # TODO: Build this on macOS or make an equivalent Mac-only job