Skip to content

Commit 1a4bd21

Browse files
authored
GHA: set ProductArchitecture when packaging the MSIs
Adjust the `msbuild` invocation to include the `ProductArchitecture` property to ensure that we build the MSIs for the proper host. This should help repair the Windows ARM64 toolchain builds.
1 parent e863e79 commit 1a4bd21

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

.github/workflows/swift-toolchain.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3815,6 +3815,7 @@ jobs:
38153815
-p:ImageRoot=${{ github.workspace }}/BuildRoot/Library/Developer `
38163816
-p:WORKAROUND_MIMALLOC_ISSUE_997=$WORKAROUND_MIMALLOC_ISSUE_997 `
38173817
-p:ProductVersion=${{ inputs.swift_version }} `
3818+
-p:ProductArchitecture=${{ matrix.arch }} `
38183819
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/bld/bld.wixproj
38193820
38203821
- name: Package CLI Tools
@@ -3827,6 +3828,7 @@ jobs:
38273828
-p:PASSPHRASE=${{ secrets.PASSPHRASE }} `
38283829
-p:ImageRoot=${{ github.workspace }}/BuildRoot/Library/Developer `
38293830
-p:ProductVersion=${{ inputs.swift_version }} `
3831+
-p:ProductArchitecture=${{ matrix.arch }} `
38303832
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/cli/cli.wixproj
38313833
38323834
- name: Package Debugging Tools
@@ -3839,6 +3841,7 @@ jobs:
38393841
-p:PASSPHRASE=${{ secrets.PASSPHRASE }} `
38403842
-p:ImageRoot=${{ github.workspace }}/BuildRoot/Library/Developer `
38413843
-p:ProductVersion=${{ inputs.swift_version }} `
3844+
-p:ProductArchitecture=${{ matrix.arch }} `
38423845
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/dbg/dbg.wixproj
38433846
38443847
- name: Package IDE Tools
@@ -3851,6 +3854,7 @@ jobs:
38513854
-p:PASSPHRASE=${{ secrets.PASSPHRASE }} `
38523855
-p:ImageRoot=${{ github.workspace }}/BuildRoot/Library/Developer `
38533856
-p:ProductVersion=${{ inputs.swift_version }} `
3857+
-p:ProductArchitecture=${{ matrix.arch }} `
38543858
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/ide/ide.wixproj
38553859
38563860
- name: Package Runtime
@@ -3874,26 +3878,26 @@ jobs:
38743878
with:
38753879
name: Windows-${{ matrix.arch }}-bld-msi
38763880
path: |
3877-
${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/bld.msi
3878-
${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/bld.cab
3881+
${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/bld.msi
3882+
${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/bld.cab
38793883
- uses: actions/upload-artifact@v4
38803884
with:
38813885
name: Windows-${{ matrix.arch }}-cli-msi
38823886
path: |
3883-
${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/cli.msi
3884-
${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/cli.cab
3887+
${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/cli.msi
3888+
${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/cli.cab
38853889
- uses: actions/upload-artifact@v4
38863890
with:
38873891
name: Windows-${{ matrix.arch }}-dbg-msi
38883892
path: |
3889-
${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/dbg.msi
3890-
${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/dbg.cab
3893+
${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/dbg.msi
3894+
${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/dbg.cab
38913895
- uses: actions/upload-artifact@v4
38923896
with:
38933897
name: Windows-${{ matrix.arch }}-ide-msi
38943898
path: |
3895-
${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/ide.msi
3896-
${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/ide.cab
3899+
${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/ide.msi
3900+
${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/ide.cab
38973901
38983902
- uses: actions/upload-artifact@v4
38993903
with:
@@ -4046,6 +4050,7 @@ jobs:
40464050
-p:PASSPHRASE=${{ secrets.PASSPHRASE }} `
40474051
-p:ImageRoot=${{ github.workspace }}/BuildRoot/Library/Developer `
40484052
-p:ProductVersion=${{ inputs.swift_version }} `
4053+
-p:ProductArchitecture=${{ inputs.build_arch }} `
40494054
-p:WindowsArchitectures="`"aarch64;i686;x86_64`"" `
40504055
-p:WindowsRuntimeARM64="${{ github.workspace }}/BuildRoot/Library/Developer/Runtimes/Windows-aarch64" `
40514056
-p:WindowsRuntimeX64="${{ github.workspace }}/BuildRoot/Library/Developer/Runtimes/Windows-x86_64" `
@@ -4234,6 +4239,7 @@ jobs:
42344239
-p:PASSPHRASE=${{ secrets.PASSPHRASE }} `
42354240
-p:ImageRoot=${{ github.workspace }}/BuildRoot/Library/Developer `
42364241
-p:ProductVersion=${{ inputs.swift_version }} `
4242+
-p:ProductArchitecture=${{ inputs.build_arch }} `
42374243
-p:AndroidArchitectures="`"x86_64;aarch64;i686;armv7`"" `
42384244
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/platforms/android/android.wixproj
42394245

0 commit comments

Comments
 (0)