Skip to content

Packaging: Set productArchitecture #941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 21, 2025

Conversation

Steelskin
Copy link
Collaborator

This fixes the Windows Arm64 build job.

@Steelskin Steelskin requested a review from compnerd April 21, 2025 13:45
@Steelskin
Copy link
Collaborator Author

Copy link
Owner

@compnerd compnerd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we not be passing that across the other MSIs as well?

@Steelskin
Copy link
Collaborator Author

Should we not be passing that across the other MSIs as well?

It seems to be only used by that one target but I don't know if msbuild and/or wix also use that property internally.

@Steelskin Steelskin force-pushed the fabrice/package-build-tools-product-arch branch from ebf5ecd to d3c7607 Compare April 21, 2025 17:10
@Steelskin Steelskin changed the title Tools: Set productArchitecture in Package job Packaging: Set productArchitecture Apr 21, 2025
@Steelskin
Copy link
Collaborator Author

Should we not be passing that across the other MSIs as well?

It seems to be only used by that one target but I don't know if msbuild and/or wix also use that property internally.

Actually I was wrong, I updated the PR. Here's the new try job: https://github.com/thebrowsercompany/swift-build/actions/runs/14577741095

@Steelskin
Copy link
Collaborator Author

Copy link
Owner

@compnerd compnerd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The smoke test failed, but the packaging succeeded. I think that this is a good step forward.

@compnerd compnerd merged commit 1a4bd21 into main Apr 21, 2025
1 check passed
@compnerd compnerd deleted the fabrice/package-build-tools-product-arch branch April 21, 2025 23:01
Steelskin pushed a commit that referenced this pull request Apr 28, 2025
This updates the packaging steps following
swiftlang/swift-installer-scripts#413

This cherry-picks the following PRs:
* GHA: shuffle the Foundation headers #918
* GHA: shuffle more files for Dispatch, Foundation #935
* Create directory before moving items #936
* GHA: adjust the installer build phases #937
* GHA: enable _Builtin_float on android #942
* Installer: Properly include Android platform #944
* Update Android root folder #943
* Packaging: Set productArchitecture #941
* Android: Update Android platform packaging #940
@Steelskin Steelskin mentioned this pull request Apr 28, 2025
Steelskin added a commit that referenced this pull request Apr 29, 2025
This updates the packaging steps following
swiftlang/swift-installer-scripts#413

This cherry-picks the following PRs:
* GHA: shuffle the Foundation headers #918
* GHA: shuffle more files for Dispatch, Foundation #935
* Create directory before moving items #936
* GHA: adjust the installer build phases #937
* GHA: enable _Builtin_float on android #942
* Installer: Properly include Android platform #944
* Update Android root folder #943
* Packaging: Set productArchitecture #941
* Android: Update Android platform packaging #940

Co-authored-by: Saleem Abdulrasool <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants