build: further consolidate macOS deployment #24669
Merged
Conversation
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
Contributor
|
Nit: typo in commit message 471491f471530360edfc5d523c7c3b9d1d096c3d: |
fanquake
force-pushed
the
consolidate_macos_deployment
branch
from
471491f to
6eacd88
Compare
Member
Author
Fixed. |
Contributor
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsReviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first. |
Contributor
Member
|
Python code review ACK 6eacd88d7c68a55de4e43946987a968316200ed2 |
laanwj
reviewed
Apr 5, 2022
laanwj
reviewed
Apr 5, 2022
By copying the .tiff earlier in the macdeploy process, we can unify the logic in the deploy script.
By generating the symlink earlier in the macdeploy process, we can unify the logic in the deploy script.
fanquake
force-pushed
the
consolidate_macos_deployment
branch
from
6eacd88 to
3d41521
Compare
Member
Author
|
Rebased, addressed nits, and added updated Guix build (macOS) to PR description. |
Member
|
Re-ACK 3d41521 |
Member
Member
Contributor
|
Post-merge ack, and confirming same hashes as fanquake |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 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.
Rather than maintaining 2 different versions of the same code (
.tiffcopying and symlink generation), consolidate to just the Python code, and use it on macOS and Linux. Previously Linux would perform the 2 actions in the makefile, and then would still be running themacdeployqtplusscript, so it makes sense to further consolidate deployment operations into the script.Guix Build (on x86_64):