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.

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

Use 'Apple silicon' instead of 'M1' #3890

Merged
merged 1 commit into from
Oct 25, 2023
Merged

Use 'Apple silicon' instead of 'M1' #3890

merged 1 commit into from
Oct 25, 2023

Conversation

cfergeau
Copy link
Contributor

There are now M2 CPUs, and more generations to come. "Apple silicon" is
more generic.

This fixes #3889

@@ -14,9 +14,9 @@ import (
var vfkitPreflightChecks = []Check{
{
configKeySuffix: "check-m1-cpu",
checkDescription: "Checking if running emulated on a M1 CPU",
checkDescription: "Checking if running emulated on Apple silicon",
check: checkM1CPU,
Copy link
Member

Choose a reason for hiding this comment

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

can we change this check also to checkMseriesCPU or checkSiliconCPU ?

There are now M2 CPUs, and more generations to come. "Apple silicon" is
more generic.

This fixes crc-org#3889
fixDescription: "This version of CRC for AMD64/Intel64 CPUs is unsupported on Apple M1 hardware",
checkDescription: "Checking if running emulated on Apple silicon",
check: checkAppleSilicon,
fixDescription: "This version of CRC for AMD64/Intel64 CPUs is unsupported on Apple silicon",
Copy link
Member

Choose a reason for hiding this comment

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

👍🏼

@praveenkumar
Copy link
Member

/lgtm
/approve

@openshift-ci
Copy link

openshift-ci bot commented Oct 25, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: praveenkumar

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci
Copy link

openshift-ci bot commented Oct 25, 2023

@cfergeau: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-crc 865a326 link true /test e2e-crc

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@praveenkumar praveenkumar merged commit db9435a into crc-org:main Oct 25, 2023
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Mac M2 arch reporting as M1
2 participants