build-git-installers: also build on macOS/ARM #608
Merged
Conversation
This file contains 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
When building the payload for the macOS installer, we already encode the
CPU architecture ("x86_64") in the name of the build directory, there is
no need to also encode the CPU vendor ("intel").
This will simplify the upcoming changes to support building for Apple
Silicon, too.
Signed-off-by: Johannes Schindelin <[email protected]>
Fix a typo. Signed-off-by: Johannes Schindelin <[email protected]>
The `die` function is not a shell built-in, it has to be defined in every step that uses it. While at it, enable the `e` flag (error if even one command fails) and `x` (trace the commands as they are executed). Signed-off-by: Johannes Schindelin <[email protected]>
This prepares the `macos-installer` code for building on Apple Silicon. The paths and a couple of flags need to be slightly different, but nothing big. The changes to the `build-git-installers` workflow: - The keen reader will notice that `CFLAGS` & friends had to be moved from environment variables (which the ARM64 `make` apparently ignores) to `config.mak`. - A couple of jobs needed to be turned into matrix jobs to handle both x86_64 and arm64 CPU architectures. - Accommodate for Homebrew being installed into `/opt/homebrew` on Apple Silicon instead of `/usr/local`, with the `bin` directory of the former _overriding_ the latter. - Homebrew on Apple Silicon apparently does not link `gcc` anymore, so let's just hard-code `gcc-13` for now. Signed-off-by: Johannes Schindelin <[email protected]>
dscho
requested review from
vdye,
mjcheetham,
jeffhostetler and
ldennington
|
The t5559 failures will be addressed via #609. |
ldennington
approved these changes
Sep 22, 2023
| @@ -764,6 +804,10 @@ jobs: | |||
| - name: Install macOS | |||
| if: contains(matrix.component.os, 'macos') | |||
| run: | | |||
| # avoid letting Homebrew's `git` in `/opt/homebrew/bin` override `/usr/local/bin/git` | |||
| test arm64 != "$(uname -m)" || | |||
There was a problem hiding this comment.
Super nitpicky, but why not use test x86_64 as you did above?
There was a problem hiding this comment.
Honestly, I'm not quite sure what is more correct: Is /opt/homebrew/ used because it's ARM64? Or is /usr/local/ only used for x86_64? So far, we only have those two CPU architectures to deal with, which means that test arm64 != and test x86_64 = would both work, but... 😄
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This modifies the
build-git-installersGitHub workflow such that it also builds a macOS/ARM64 package. Example run is here: https://github.com/microsoft/git/actions/runs/6273987160/job/17040468903. @jeffhostetler kindly validated on their M1.This fixes #565.