-
Notifications
You must be signed in to change notification settings - Fork 108
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Generate arm64 builds of git and git-lfs #354
Conversation
It seems we didn't even use it
- name: Use go ${{ matrix.go }} | ||
uses: actions/setup-go@v2 | ||
with: | ||
go-version: ${{ matrix.go }} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I needed to enforce a newer version of go (by default it used 1.15) otherwise go wouldn't be able to link git-lfs for arm64.
shell: bash | ||
run: script/build.sh | ||
env: | ||
TARGET_PLATFORM: ${{ matrix.targetPlatform }} | ||
TARGET_ARCH: ${{ matrix.arch }} | ||
# Needed for macOS arm64 until hosted macos-11.0 runners become available | ||
SDKROOT: /Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I made a specific job for arm64 in order to keep SDKROOT
used only here, since we're specifically trying to use an older version of Xcode and the SDK for macOS x86_64 for maximum compatibility with older macOS versions (see #350).
}, | ||
"smimesign": { | ||
"version": "0.0.6", | ||
"files": [ | ||
{ | ||
"platform": "darwin", | ||
"arch": "amd64", | ||
"name": "smimesign-0.0.6-macos.tgz", | ||
"checksum": "771790f685176b132cb287302a9374120184f7f7973038a0232efee145781906" | ||
}, | ||
{ | ||
"platform": "windows", | ||
"arch": "amd64", | ||
"name": "smimesign-windows-amd64-0.0.6.zip", | ||
"checksum": "2a2f946e31f2d74eadcdcd97b7bfc69298cee2f11cf7cb03c604d28fa1b34cd3" | ||
}, | ||
{ | ||
"platform": "windows", | ||
"arch": "x86", | ||
"name": "smimesign-windows-386-0.0.6.zip", | ||
"checksum": "9a13d00aa02c0a5d277c030297d09f10a467f31e6740f1520a08e09a23046323" | ||
} | ||
] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I realized we don't use smimesign at all, so I spent some time trying to make it build for arm64 but it's not needed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
✨
Also remove go version specification as the default version is now high enough ( see desktop#354 (comment) )
Also remove go version specification as the default version is now high enough ( see desktop#354 (comment) )
Also remove go version specification as the default version is now high enough ( see desktop#354 (comment) )
Also remove go version specification as the default version is now high enough ( see desktop#354 (comment) )
Also remove go version specification as the default version is now high enough ( see desktop#354 (comment) )
This PR fixes the build-macos script and our CI workflow to allow generating macOS builds of git and git-lfs for arm64.
In order to do that there are a couple of "hacks":
DEVELOPER_CLFAGS
to "inject" our-target
cflag to specify the target architecture.go generate
git-lfs/git-lfs#4492 for more details.