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

[6.x] Add support for Mac ARM64 architecture #876

Merged
merged 4 commits into from
Feb 16, 2021
Merged

[6.x] Add support for Mac ARM64 architecture #876

merged 4 commits into from
Feb 16, 2021

Conversation

crynobone
Copy link
Member

Signed-off-by: Mior Muhammad Zaki [email protected]

Signed-off-by: Mior Muhammad Zaki <[email protected]>
Signed-off-by: Mior Muhammad Zaki <[email protected]>
Signed-off-by: Mior Muhammad Zaki <[email protected]>
default:
return 'mac';
}
}
Copy link
Member Author

Choose a reason for hiding this comment

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

This different from PR sent to master. Instead of having onMacIntel() and onMacArm() we can just stick with onMac() and then have a new method to return architecture value.

@@ -59,6 +59,8 @@ class ChromeDriverCommand extends Command
protected $slugs = [
'linux' => 'linux64',
'mac' => 'mac64',
'mac-intel' => 'mac64',
'mac-arm' => 'mac64_m1',
Copy link
Member Author

Choose a reason for hiding this comment

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

mac key will remain for fallback in case architecture value doesn't match x86_64 or arm64.

@driesvints
Copy link
Member

@crynobone this looks good to me 👍

@sirdharma can you give this a review? We're planning on introducing ARM64 support on Dusk 6.x so we can delay Dusk 7.x until PHPUnit 10 is released.

taylorotwell pushed a commit that referenced this pull request Feb 16, 2021
* Refactor PR to match changes to 6.x

Signed-off-by: Mior Muhammad Zaki <[email protected]>

* Allow tests on phpunit 10.

Signed-off-by: Mior Muhammad Zaki <[email protected]>

* Skip testbench 5.

Signed-off-by: Mior Muhammad Zaki <[email protected]>
@taylorotwell taylorotwell merged commit 508f27a into laravel:6.x Feb 16, 2021
@crynobone crynobone deleted the mac-arm-support branch February 17, 2021 01:04
@sirdharma
Copy link
Contributor

@driesvints LGTM 👍

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.

4 participants