Improve building Homebrew*.pkg #16077
Conversation
MikeMcQuaid
force-pushed
the
build_pkg_improvements
branch
4 times, most recently
from
9b2afad
to
fa04b33
Compare
MikeMcQuaid
force-pushed
the
build_pkg_improvements
branch
6 times, most recently
from
c256d7b
to
8fb9ad6
Compare
- split jobs into build/test/deploy - test package on both macOS Intel and Apple Silicon - cleanup some argument handling - use `HOMEBREW_MACOS_OLDEST_SUPPORTED` naming to be consistent with `brew.sh` - note in `brew.sh` that `Distribution.xml` also needs updated (and do so) - various other little bits of style cleanup
MikeMcQuaid
force-pushed
the
build_pkg_improvements
branch
from
8fb9ad6
to
c95a26b
Compare
MikeMcQuaid
added
the
critical
|
Marking as |
| @@ -27,7 +27,7 @@ | |||
| <license file="LICENSE.rtf"/> | |||
| <conclusion file="CONCLUSION.rtf" /> | |||
| <allowed-os-versions> | |||
| <os-version min="11.0"/> | |||
| <os-version min="12.0.0"/> | |||
There was a problem hiding this comment.
I think it's worth investigating whether these are necessary, or if the pkgbuild --min-os-version is sufficient. Might fail at different times of the install process, or simply not at all, so worth comparing by setting to 15.0 or whatever.
If it is needed: maybe make this like an .in file and make this @@HOMEBREW_MACOS_OLDEST_SUPPORTED@@.0 and do sed in the workflow. I do similar things in the ci-orchestrator deploy workflow.
There was a problem hiding this comment.
I'd really like to avoid a .in flow here for a number that's changed once a year.
I'm game for you to remove this if you verify --min-os-version is sufficient.
| git -C /usr/local/Homebrew checkout --force master | ||
| else | ||
| mkdir -vp /usr/local/bin | ||
| mv "${homebrew_directory}" "/usr/local/Homebrew/" |
There was a problem hiding this comment.
This has different behaviour if /usr/local/Homebrew/ is already created, which could happen if the /usr/local/bin/brew was missing (e.g. failed previous install or improper uninstall).
I'd consider changing the -f "/usr/local/bin/brew" && -d "/usr/local/Homebrew" to just -d "/usr/local/Homebrew" and consider bin/brew separately.
There was a problem hiding this comment.
(e.g. failed previous install or improper uninstall).
If we're in this state: this installer is practically guaranteed to break.
This change was made because the cp -a command was no longer reliable and was failing consistently on reinstall. I'm game to iterate on what this is here but I'm personally not gonna spend much more time on this unless we get user reports.
HOMEBREW_MACOS_OLDEST_SUPPORTEDnaming to be consistent withbrew.shbrew.shthatDistribution.xmlalso needs updated (and do so)