-
Notifications
You must be signed in to change notification settings - Fork 4.8k
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
fix: allow build on macos via docker #20881
base: main
Are you sure you want to change the base?
Conversation
57279f8
to
dff81a4
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #20881 +/- ##
===========================================
+ Coverage 45.36% 66.10% +20.73%
===========================================
Files 244 1049 +805
Lines 13333 114602 +101269
Branches 2719 2856 +137
===========================================
+ Hits 6049 75756 +69707
- Misses 6983 34706 +27723
- Partials 301 4140 +3839
Flags with carried forward coverage won't be shown. Click here to find out more. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am giving your changes a test, I also have a few other macos related PRs open.
Contains PR #20506 |
A similar approach helped me to build images on my Mac a few months ago. Recently I discovered that environment variable does a similar job.
Tested only with gitlab runner on Mac. |
This is definitely good to know, I wasn't aware about But maybe being explicit about it isn't that bad. |
@thoro Hi, please rebase the main branch and resolve the conflicts. |
8f1d9f7
to
7642ebe
Compare
Signed-off-by: Thomas Rosenstein <thomas@thoro.at>
7642ebe
to
74dda50
Compare
@chlins done |
I've verified this PR in my laptop M3 mac, running
|
Comprehensive Summary of your change
Add the option to define the platform inside the Makefile, it defaults to linux and the corresponding arch where the Makefile is executed. For macos M1+ that would be arm64 - this requires the arch binary.
This is only intended for testing builds on macos / arm and not for running harbor on mac as a hosting platform
Updated the spectral version to the newest version (6.11.1) which provides an arm64 image.
Issue being fixed
Fixes #20852 #17016 #15928 (and probably others)
Improves #19688
Please indicate you've done the following: