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

Update macos runner #1165

Merged
merged 7 commits into from
Feb 2, 2024
Merged

Update macos runner #1165

merged 7 commits into from
Feb 2, 2024

Conversation

sharkAndshark
Copy link
Collaborator

Try to fix #1162

Copy link
Member

@nyurik nyurik left a comment

Choose a reason for hiding this comment

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

I updated the runners a bit. Sadly, it seems it might be trickier to actually test nginx on M1 -- so up to you - we can merge this as is, and work on the nginx test on M1 separately, or do it all in this PR

@sharkAndshark
Copy link
Collaborator Author

Thx @nyurik ! I will try Ngnix on my local M1 MacBook and update this PR then.

@@ -248,7 +248,7 @@ jobs:
- target: debian-x86_64
os: ubuntu-latest
- target: x86_64-apple-darwin
os: macos-12 # x64 CPU
os: macos-14 # M1 CPU
Copy link
Member

Choose a reason for hiding this comment

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

You don't want M1 CPU here because we are building x86 target

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Oh ok. I thought we can build x86 target on M1, can we?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I thought we could generate x86 and arm target both on M1, I'm not sure.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Oh I see I see.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Seems M1 could build and run(by Rosetta) x86_64-apple-darwin, but it's not the best choice. I've already switch back to macos-12 runner. Thx @nyurik

@sharkAndshark sharkAndshark marked this pull request as ready for review February 2, 2024 03:14
@@ -320,6 +320,7 @@ jobs:
- name: Start HTTP Server (MacOS, no Docker)
if: runner.os == 'macos'
run: |
mkdir -p /usr/local/etc/nginx
Copy link
Member

@nyurik nyurik Feb 2, 2024

Choose a reason for hiding this comment

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

i'm not sure we should create a directory that nginx doesn't know about. We may have to just download nginx from somewhere... anyway, i think it might not be worth our time at this stage - until they install nginx on -13 and -14 the same way they have it on -12 (latest).

Copy link
Collaborator Author

@sharkAndshark sharkAndshark Feb 2, 2024

Choose a reason for hiding this comment

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

We could do more when macos-14 is stable, now is beta. There are many issues bigger than #1162.

@nyurik nyurik merged commit d39136f into maplibre:main Feb 2, 2024
10 checks passed
@sharkAndshark sharkAndshark deleted the m1_runner branch February 2, 2024 05:16
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.

Migrate MacOS CI to use new MacOS M1 runners
2 participants