Skip to content
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

Resolve Apple M1 Arch Support Issues #392

Merged
merged 14 commits into from
Mar 15, 2022
Merged

Resolve Apple M1 Arch Support Issues #392

merged 14 commits into from
Mar 15, 2022

Conversation

jeff-mccoy
Copy link
Contributor

@jeff-mccoy jeff-mccoy commented Mar 13, 2022 •
edited
Loading

Description

Cleans up amd/arm64 arch behavior for Apple M1 computers. This PR will not cover all tasks in #386, only those related to Apple M1 usage.

Related Issue

#386

Type of change

  • Bug fix (non-breaking change which fixes an issue)

Checklist before merging

  • Documentation has been updated as necessary (add the needs-docs label)

@jeff-mccoy jeff-mccoy added this to the Zarf GA milestone Mar 13, 2022
@jeff-mccoy jeff-mccoy linked an issue Mar 13, 2022 that may be closed by this pull request
Complete ARM Support #386
Closed
4 tasks
@jeff-mccoy jeff-mccoy added the needs-docs PR Label - Docs required to merge label Mar 13, 2022
@jeff-mccoy jeff-mccoy added the bug 🐞 Something isn't working label Mar 14, 2022
YrrepNoj
YrrepNoj reviewed Mar 15, 2022
View reviewed changes
Makefile Show resolved Hide resolved
YrrepNoj
YrrepNoj reviewed Mar 15, 2022
View reviewed changes
cli/config/config.go Outdated Show resolved Hide resolved
@jeff-mccoy jeff-mccoy marked this pull request as ready for review March 15, 2022 01:36
@YrrepNoj
Copy link
Contributor

YrrepNoj commented Mar 15, 2022 •
edited
Loading

Tests are failing because package names generation has been changed but we're still using the old name in the tests. Once the test get updated I will approve.

Edit: I also just realized that the way we generate the name at package create time means the way we call the packages we use in the tests will need more logic than just changing the packageString so that the tests will still be runnable locally on different architectures.

@jeff-mccoy jeff-mccoy removed the needs-docs PR Label - Docs required to merge label Mar 15, 2022
YrrepNoj
YrrepNoj reviewed Mar 15, 2022
View reviewed changes
Makefile Show resolved Hide resolved
YrrepNoj
YrrepNoj approved these changes Mar 15, 2022
View reviewed changes
Copy link
Contributor

@YrrepNoj YrrepNoj left a comment

Choose a reason for hiding this comment

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

We'll need to add an issue to find an elegant way to determine the ARCH in the Makefile.

The current way doesn't break local e2e testing on arm architectures, but it will be slower because they will always build all the packages as part of the make test-e2e

@jeff-mccoy jeff-mccoy merged commit 5868bb2 into master Mar 15, 2022
@jeff-mccoy jeff-mccoy deleted the 386-complete-arm-support branch March 15, 2022 18:15
@jeff-mccoy jeff-mccoy mentioned this pull request Mar 15, 2022
Closed
Noxsios pushed a commit that referenced this pull request Mar 8, 2023
@jeff-mccoy
Resolve Apple M1 Arch Support Issues (#392)
24d66a5 
* fix arch flag binding on sub-commands
* remove hard-code package arch for zarf init
* build amd64+arm64 archs for make init-package
* include arch in package name on create
* update docs & build steps for amd/arm init package names
* make tests aware of new package name structure
* change to zarf-init-<arch>.tar.zst for all docs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@YrrepNoj YrrepNoj YrrepNoj approved these changes

Assignees
No one assigned
Labels
bug 🐞 Something isn't working
Projects
None yet
Milestone
Zarf GA
Development

Successfully merging this pull request may close these issues.

Complete ARM Support
2 participants
@jeff-mccoy @YrrepNoj