Generate arm64 builds of git and git-lfs #354
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,10 +27,16 @@ jobs: | |
| matrix: | ||
| os: [macos-10.15, windows-2019, ubuntu-18.04] | ||
| arch: [32, 64] | ||
| go: [1.16.3] | ||
| include: | ||
| - os: macos-10.15 | ||
| friendlyName: macOS | ||
| targetPlatform: macOS | ||
| - os: macos-10.15 | ||
| friendlyName: macOS | ||
| targetPlatform: macOS | ||
| arch: arm64 | ||
| go: 1.16.3 | ||
| - os: windows-2019 | ||
| friendlyName: Windows | ||
| targetPlatform: win32 | ||
|
|
@@ -44,9 +50,9 @@ jobs: | |
| arch: 32 | ||
| timeout-minutes: 20 | ||
| steps: | ||
| # We need to use Xcode 10.3 for maximum compatibility with older macOS (x64) | ||
| - name: Switch to Xcode 10.3 | ||
| if: matrix.targetPlatform == 'macOS' && matrix.arch == 64 | ||
| run: | | ||
| sudo xcode-select -s /Applications/Xcode_10.3.app/Contents/Developer/ | ||
| # Delete the command line tools to make sure they don't get our builds | ||
|
|
@@ -57,6 +63,10 @@ jobs: | |
| submodules: recursive | ||
| # Needed for script/package.sh to work | ||
| fetch-depth: 0 | ||
| - name: Use go ${{ matrix.go }} | ||
| uses: actions/setup-go@v2 | ||
| with: | ||
| go-version: ${{ matrix.go }} | ||
| - name: Install dependencies | ||
| run: npm install | ||
| - name: Check formatting | ||
|
|
@@ -66,12 +76,22 @@ jobs: | |
| - name: Install extra dependencies for building Git on Ubuntu | ||
| if: matrix.targetPlatform == 'ubuntu' | ||
| run: sudo apt-get install libcurl4-openssl-dev libexpat1-dev gettext | ||
| - name: Build (except macOS arm64) | ||
| if: matrix.targetPlatform != 'macOS' || matrix.arch != 'arm64' | ||
| shell: bash | ||
| run: script/build.sh | ||
| env: | ||
| TARGET_PLATFORM: ${{ matrix.targetPlatform }} | ||
| TARGET_ARCH: ${{ matrix.arch }} | ||
| - name: Build (macOS arm64) | ||
| if: matrix.targetPlatform == 'macOS' && matrix.arch == '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 | ||
|
Member
Author
There was a problem hiding this comment. I made a specific job for arm64 in order to keep |
||
| - name: Package | ||
| shell: bash | ||
| run: script/package.sh | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,28 +40,5 @@ | |
| "checksum": "0e13b411ca6c2b2cfb3d82b67ae747ca5d055734d0ab2030d0823fc37ad48902" | ||
| } | ||
| ] | ||
|
Comment on lines
-43
to
-65
Member
Author
There was a problem hiding this comment. 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. |
||
| } | ||
| } | ||
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
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
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
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.
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.