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

Add M1 macs #2565

Merged
merged 11 commits into from
Apr 6, 2021
Merged

Add M1 macs #2565

merged 11 commits into from
Apr 6, 2021

Conversation

AshCripps
Copy link
Member

Update the ansible scripts to support apple silicon and add the three new M1 macs donated to us by macstadium.

@nodejs/build-infra can I get 207.254.38.74 added to the release ci firewall and 207.254.38.86 + 207.254.38.89 to the test ci firewall please?

The commented lines will be readded this branch is quite old so I had some bugs to iron out

@richardlau
Copy link
Member

@nodejs/build-infra can I get 207.254.38.74 added to the release ci firewall and 207.254.38.86 + 207.254.38.89 to the test ci firewall please?

Done.

ansible/inventory.yml Outdated Show resolved Hide resolved
ansible/playbooks/jenkins/worker/create.yml Outdated Show resolved Hide resolved
ansible/roles/baselayout/tasks/main.yml Outdated Show resolved Hide resolved
@@ -87,6 +87,10 @@ needs_monit: [
'debian7',
]

archtype: {
macos11.0: 'arm64'
Copy link
Member

Choose a reason for hiding this comment

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

Is there not going to be any Intel testing on macOS 11?

Copy link
Member Author

Choose a reason for hiding this comment

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

Currently no, we dont have the machines for it.

Copy link
Member

Choose a reason for hiding this comment

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

@AshCripps we probably add a task to add macOS 11 machines for intel, I believe we have enough capacity to do that right?

ansible/inventory.yml Outdated Show resolved Hide resolved
@@ -8,6 +8,6 @@
- name: "ccache : add ccache to the path (macos)"
when: ccache_mac.rc == 1
lineinfile:
dest: "etc/paths"
dest: "/etc/paths"
insertbefore: BOF
line: "usr/local/opt/ccache/libexec"
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
line: "usr/local/opt/ccache/libexec"
line: "/usr/local/opt/ccache/libexec"

Sorry, looks like I inadvertently dropped the leading slash in the refactor in https://github.com/nodejs/build/pull/2569/files#diff-01b473334dd8c7ebd76126710bd5ba533d6334a363653425f7d4b27adff36616.

Copy link
Member

@mhdawson mhdawson left a comment

Choose a reason for hiding this comment

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

LGTM

@AshCripps AshCripps merged commit e93b526 into nodejs:master Apr 6, 2021
@AshCripps AshCripps deleted the apple-silicon branch April 6, 2021 15:04
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