Skip to content

Enable ARM64 packaging for macOS #15768

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
rjmholt merged 33 commits into from
Jul 16, 2021
Merged

Enable ARM64 packaging for macOS #15768

rjmholt merged 33 commits into from
Jul 16, 2021

Conversation

@rjmholt
Copy link
Collaborator

@rjmholt rjmholt commented Jul 13, 2021

PR Summary

Fixes #15146, partially solves #15203.

PR Context

PR Checklist

@ghost ghost assigned iSazonov Jul 13, 2021
adityapatwardhan
adityapatwardhan requested changes Jul 14, 2021
View reviewed changes
build.psm1 Outdated
# The property is set in Powershell.Common.props file.
# We override the property through the build command line.
if($Options.Runtime -like 'fxdependent*' -or $ForMinimalSize) {
if($Options.Runtime -eq 'osx-arm64' -or $Options.Runtime -like 'fxdependent*' -or $ForMinimalSize) {
Copy link
Member

@adityapatwardhan adityapatwardhan Jul 14, 2021

Choose a reason for hiding this comment

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

I believe r2r is supported with crossgen2.

Copy link
Collaborator Author

@rjmholt rjmholt Jul 15, 2021

Choose a reason for hiding this comment

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

I've made the change, although since your PR to move to crossgen2 is still in draft, that's probably the right place to make the change when that move happens

build.psm1 Outdated

function Test-IsArm64MacOS
{
return $IsMacOS -and (Start-NativeExecution -IgnoreExitCode { (arch -arm64 uname -p) -eq 'arm' } 2>$null)
Copy link
Member

@adityapatwardhan adityapatwardhan Jul 14, 2021

Choose a reason for hiding this comment

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

Can we add this in Get-EnvironmentInfo.. that function is used by tests and packaging i believe which might need this info.

@ghost ghost added the Waiting on Author The PR was reviewed and requires changes or comments from the author before being accept label Jul 14, 2021
@ghost ghost removed the Waiting on Author The PR was reviewed and requires changes or comments from the author before being accept label Jul 15, 2021
@adityapatwardhan
Copy link
Member

adityapatwardhan commented Jul 15, 2021

please fix CI issues

@rjmholt
Copy link
Collaborator Author

rjmholt commented Jul 15, 2021

I don't understand the failure -- why is Start-NativeExecution not defined where I've used it but defined for other uses in the same file?

@rjmholt
Copy link
Collaborator Author

rjmholt commented Jul 16, 2021

@adityapatwardhan please re-review

@rjmholt rjmholt enabled auto-merge (squash) July 16, 2021 21:26
@rjmholt rjmholt merged commit 528d222 into PowerShell:master Jul 16, 2021
@rjmholt rjmholt deleted the m1-tar-pkg branch July 16, 2021 22:07
@rjmholt rjmholt added the CL-BuildPackaging Indicates that a PR should be marked as a build or packaging change in the Change Log label Jul 21, 2021
@ghost
Copy link

ghost commented Jul 22, 2021

🎉v7.2.0-preview.8 has been released which incorporates this pull request.:tada:

Handy links:

@ghost ghost mentioned this pull request Jul 22, 2021
Closed
@TravisEz13
Copy link
Member

TravisEz13 commented Mar 12, 2022

partial backport for infrastructure fixe
ce6a9d1

daxian-dbw pushed a commit to daxian-dbw/PowerShell that referenced this pull request Mar 14, 2022
@TravisEz13 @adityapatwardhan
Enable ARM64 packaging for macOS (PowerShell#15768)
ce6a9d1 
# Conflicts:
#	tools/packaging/packaging.psm1
#	tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
#	tools/releaseBuild/azureDevOps/templates/mac.yml
daxian-dbw pushed a commit to daxian-dbw/PowerShell that referenced this pull request Mar 15, 2022
@TravisEz13
Enable ARM64 packaging for macOS (PowerShell#15768)
6a15f73 
# Conflicts:
#	tools/packaging/packaging.psm1
#	tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
#	tools/releaseBuild/azureDevOps/templates/mac.yml

# Conflicts:
#	tools/ci.psm1
@ghost
Copy link

ghost commented Mar 16, 2022

🎉v7.0.9 has been released which incorporates this pull request.:tada:

Handy links:

@TravisEz13 TravisEz13 mentioned this pull request Oct 12, 2022
Merged
22 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@TravisEz13 TravisEz13 TravisEz13 approved these changes

@adityapatwardhan adityapatwardhan adityapatwardhan approved these changes

@anmenaga anmenaga Awaiting requested review from anmenaga

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

Assignees

@adityapatwardhan adityapatwardhan

Labels

Backport-7.0.x-Done BackPort-7.1.x-Done Backport to 7.1.x completed CL-BuildPackaging Indicates that a PR should be marked as a build or packaging change in the Change Log

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Native support for Mac m1

4 participants

@rjmholt @adityapatwardhan @TravisEz13 @iSazonov