Create universal builds on macos #612
Conversation
|
The compile/link in the macos build is failing because libcurl is not fat. Homebrew does not ship universal binaries, but does ship skinny binaries for both platforms. We should look to add a step that takes them and lipo's them together before trying to compile git. |
|
Update: I got things mostly working in https://github.com/microsoft/git/tree/jh/macos-universal, but there's now a problem with docbook (seems that the |
I've seen similar problems before (in Git for Windows) when the corresponding entry in |
I fixed this via 757c884: it was picking up the wrong flavor of Homebrew ( |
|
Update: I got things to build, but the validation of the installer is failing because it cannot find the |
D'oh, it's still looking for |
I managed to fix it (and while at it, extend the validation matrix to also test the result on macOS/ARM): https://github.com/microsoft/git/actions/runs/6759896633/job/18373034703 |
This commit puts `.dmg` on a diet by skipping dashed built-ins. This uses the `SKIP_DASHED_BUILT_INS` on macOS to avoid even building them. Otherwise, they would end up as non-hard-linked copies in the `.dmg` file which makes that disk image rather unnecessarily large. Signed-off-by: Jeff Hostetler <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
When building Git as a universal binary on macOS, the binary supports more than one target architecture. This is a bit of a problem for the `HOST_CPU` setting that is woefully unprepared for such a situation, as it wants to show architecture hard-coded at build time. In preparation for switching to universal builds, work around this by special-casing `universal` and replacing it at run-time with the known values `x86_64` or `arm64`. Signed-off-by: Jeff Hostetler <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
This switches to universal builds, i.e. binaries that contain both x86_64 and arm64 parts. That way, the same `.pkg`/`.dmg` can be used on Intel as well as on ARM Macs. To that end, we are installing the Intel flavor of Homebrew on a macOS/ARM runner, install the dependencies both in the Intel and ARM flavor of Homebrew, and then use `lipo` to concoct universal versions of the dependencies. Since we do not ship those dependencies anyway, things work magically in the installed setups as long as the dependencies are present there, too. Note that for this hack to work, we no longer want to override the `PATH` by prefixing `/usr/local/bin/` because `/usr/local/` is the home of Homebrew's Intel variant only, not of the ARM variant (which calls `/opt/homebrew/` its home). And in any case, Homebrew's `bin/` directory is in the `PATH` of the runners we use, no need to be explicit about it. Signed-off-by: Jeff Hostetler <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
We configure the build using a `config.mak` file for better debuggability, which means that we also need to copy the `config.mak` file to the build directory within `payload/` so that the (re-)build (`make ... payload`) works correctly. Signed-off-by: Johannes Schindelin <[email protected]>
Sometimes the Makefile process is too fast and the `hdiutil` command fails with: hdiutil: create failed - Resource busy A couple moments later that command would succeed, though. So let's just try again after sleeping 5s. Signed-off-by: Johannes Schindelin <[email protected]>
Now that we're building universal binaries on macOS, let's verify them on Intel _and_ on ARM runners. Signed-off-by: Johannes Schindelin <[email protected]>
Let's also verify that the correct CPU is reported in universal builds' `git version --build-options`. Signed-off-by: Johannes Schindelin <[email protected]>
dscho
force-pushed
the
jeffhostetler/macos-universal-builds
branch
2 times, most recently
from
8ce9814
to
eb881c1
Compare
|
Okay, it works now (and I finally force-pushed a clean set of commits to this here PR). This workflow (which has only a couple of commits to reduce building to macOS) shows that it works, and that we're also nicely reducing the |
|
Notes: testing the artifacts from #612 (comment)
|
Update config.mak.uname and GitHub workflow to create a DMG and PKG containing universal binaries rather than separate single-platform packages.