Skip to content

Let macOS installer run without Rosetta on Apple Silicon #16742

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.

Sign up for GitHub

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

Jump to bottom
Merged
daxian-dbw merged 1 commit into from
Jan 24, 2022
Merged

Let macOS installer run without Rosetta on Apple Silicon #16742

daxian-dbw merged 1 commit into from
Jan 24, 2022

Conversation

@dahlia
Copy link
Contributor

@dahlia dahlia commented Jan 13, 2022

PR Summary

Let the macOS installer can run without Rosetta on Apple Silicon.

PR Context

This patch makes the macOS installer (powershell-*-osx-arm64.pkg) able to run without Rosetta on Apple Silicon (e.g., M1, M1 Pro, M1 Max). Although the executable binary (pwsh) in itself already natively runs on Apple Silicon, the installer for it still requires Rosetta (as of 7.3.0-preview.1):

To install “PowerShell - 7.3.0-preview.1”, you need to install Rosetta. Do you want to install it now? Rosetta enables Intel-based features to run on Apple silicon Macs. Reopening applications after installation is required to start using Rosetta.

I fixed it by specifying the proper hostArchitectures to the installer-gui-script configuration. (In PowerShell's packaging script, the template for it is placed in tools/packaging/packaging.strings.psd1.) The solution was inspired by fish's fix commit: fish-shell/fish-shell@c1a1b70.

Fixes #16571.

PR Checklist

@ghost ghost assigned daxian-dbw Jan 13, 2022
@ghost
Copy link

ghost commented Jan 13, 2022 •
edited by ghost
Loading

CLA assistant check
All CLA requirements met.

TravisEz13
TravisEz13 approved these changes Jan 18, 2022
View reviewed changes
Copy link
Member

@TravisEz13 TravisEz13 left a comment

Choose a reason for hiding this comment

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

I don't see any blocking issues.

tools/packaging/packaging.psm1 Outdated
Copy link
Member

@TravisEz13 TravisEz13 Jan 18, 2022

Choose a reason for hiding this comment

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

is there any package type that doesn't have an explicit statement? If not, we can replace default with a throw that this type is unknown

Copy link
Contributor Author

@dahlia dahlia Jan 19, 2022

Choose a reason for hiding this comment

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

I'm not sure if there are any other package types, as I have no much experience on this code base. I'm going to let the default case throw an error that this type is unknown if you (or any other maintainers) ask!

Copy link
Member

@daxian-dbw daxian-dbw Jan 20, 2022

Choose a reason for hiding this comment

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

@TravisEz13 anything you want @dahlia to change? If not, I will merge the PR as is.

Copy link
Collaborator

@iSazonov iSazonov Jan 21, 2022

Choose a reason for hiding this comment

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

I guess it was a question for MSFT team about release process :-)

@daxian-dbw daxian-dbw added the Waiting on Author The PR was reviewed and requires changes or comments from the author before being accept label Jan 18, 2022
@iSazonov
Copy link
Collaborator

iSazonov commented Jan 19, 2022

@dahlia Please rebase to fix CI-static.

@ghost ghost removed the Waiting on Author The PR was reviewed and requires changes or comments from the author before being accept label Jan 19, 2022
@dahlia dahlia force-pushed the macos-universal-installer branch from e048de6 to 2b9ab91 Compare January 19, 2022 04:41
@pull-request-quantifier-deprecated
Copy link

pull-request-quantifier-deprecated bot commented Jan 19, 2022

This PR has 39 quantified lines of changes. In general, a change size of upto 200 lines is ideal for the best PR experience!

Quantification details 

Label      : Extra Small
Size       : +36 -3
Percentile : 15.6%

Total files changed: 2

Change summary by file extension:
.psm1 : +35 -2
.psd1 : +1 -1

Change counts above are quantified counts, based on the PullRequestQuantifier customizations.

Why proper sizing of changes matters

Optimal pull request sizes drive a better predictable PR flow as they strike a
balance between between PR complexity and PR review overhead. PRs within the
optimal size (typical small, or medium sized PRs) mean:

  • Fast and predictable releases to production:
    • Optimal size changes are more likely to be reviewed faster with fewer
      iterations.
    • Similarity in low PR complexity drives similar review times.
  • Review quality is likely higher as complexity is lower:
    • Bugs are more likely to be detected.
    • Code inconsistencies are more likely to be detetcted.
  • Knowledge sharing is improved within the participants:
    • Small portions can be assimilated better.
  • Better engineering practices are exercised:
    • Solving big problems by dividing them in well contained, smaller problems.
    • Exercising separation of concerns within the code changes.

What can I do to optimize my changes

  • Use the PullRequestQuantifier to quantify your PR accurately
    • Create a context profile for your repo using the context generator
    • Exclude files that are not necessary to be reviewed or do not increase the review complexity. Example: Autogenerated code, docs, project IDE setting files, binaries, etc. Check out the Excluded section from your prquantifier.yaml context profile.
    • Understand your typical change complexity, drive towards the desired complexity by adjusting the label mapping in your prquantifier.yaml context profile.
    • Only use the labels that matter to you, see context specification to customize your prquantifier.yaml context profile.
  • Change your engineering behaviors
    • For PRs that fall outside of the desired spectrum, review the details and check if:
      • Your PR could be split in smaller, self-contained PRs instead
      • Your PR only solves one particular issue. (For example, don't refactor and code new features in the same PR).

How to interpret the change counts in git diff output

  • One line was added: +1 -0
  • One line was deleted: +0 -1
  • One line was modified: +1 -1 (git diff doesn't know about modified, it will
    interpret that line like one addition plus one deletion)
  • Change percentiles: Change characteristics (addition, deletion, modification)
    of this PR in relation to all other PRs within the repository.

Was this comment helpful? 👍  :ok_hand:  :thumbsdown: (Email)
Customize PullRequestQuantifier for this repository.

@dahlia
Copy link
Contributor Author

dahlia commented Jan 19, 2022

@iSazonov Rebased!

@daxian-dbw daxian-dbw added the CL-BuildPackaging Indicates that a PR should be marked as a build or packaging change in the Change Log label Jan 19, 2022
@dahlia
Copy link
Contributor Author

dahlia commented Jan 20, 2022

Would there be more I need to adjust?

@daxian-dbw daxian-dbw merged commit ae38dad into PowerShell:master Jan 24, 2022
@daxian-dbw
Copy link
Member

daxian-dbw commented Jan 24, 2022

Chatted with @TravisEz13 offline and there is no blocker to merge this PR.
@dahlia Thanks for your contribution!

@ghost
Copy link

ghost commented Feb 24, 2022

🎉v7.3.0-preview.2 has been released which incorporates this pull request.:tada:

Handy links:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@iSazonov iSazonov iSazonov left review comments

@TravisEz13 TravisEz13 TravisEz13 approved these changes

@adityapatwardhan adityapatwardhan Awaiting requested review from adityapatwardhan

@anmenaga anmenaga Awaiting requested review from anmenaga

@daxian-dbw daxian-dbw Awaiting requested review from daxian-dbw

@PaulHigin PaulHigin Awaiting requested review from PaulHigin

Assignees

@daxian-dbw daxian-dbw

Labels

CL-BuildPackaging Indicates that a PR should be marked as a build or packaging change in the Change Log Extra Small

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Fresh Installation of 7.2 (arm version) on Apple Silicon reqiures Rosetta

4 participants

@dahlia @iSazonov @daxian-dbw @TravisEz13