Bugfix/docker bake linux amd64 macos#384
Open
esalituro wants to merge 4 commits into
Open
Conversation
jfpanisset
previously approved these changes
Apr 11, 2026
Contributor
jfpanisset
left a comment
jfpanisset
left a comment
There was a problem hiding this comment.
Thank you for this Eric, I've had to resolve some merge conflicts since your branch ran into some recent cleanup changes (getting rid of the --use-conan option in aswfdocker), can you take a look and make sure I didn't break anything before merging?
Contributor
|
Ugh, I may have messed something up, I've tried to resolve the conflicts, but GitHub is still showing "This branch cannot be rebased due to conflicts". Any chance you could resubmit the changes against a fresh checkout from top of main? I don't want to mess up the repo by attempting to do things I don't fully understand. |
Signed-off-by: Eric Salituro <esalituro@icloud.com> Co-authored-by: Cursor <cursoragent@cursor.com>
- README: Linux artifacts on macOS, Docker 8c/16GB, buildx on Docker VMM vs Rosetta Signed-off-by: Eric Salituro <esalituro@icloud.com> Co-authored-by: Cursor <cursoragent@cursor.com>
esalituro
force-pushed
the
bugfix/docker-bake-linux-amd64-macos
branch
from
76d1ba8 to
12702de
Compare
Contributor
|
Looks good, as soon as I have a working set of latest releases done I'll merge this. Thank you! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds and explicit platforms for MacOS builds. Adds test to confirm it only affects MacOS.
Updates README.md with MacOS notes.