build-and-deploy: add support for arm64 builds #4

dennisameling · 2022-12-19T21:52:34Z

Note that this only works for self-hosted runners. GitHub Actions will pick up and use the first available arm64 runner.

Here's a successful run for mingw-w64-openssl on aarch64: https://github.com/dennisameling/git-for-windows-automation/actions/runs/3735260060/jobs/6338362688. Note that I had to do some manual fixes as the pipeline assumes it has a GitHub app (GH_APP_ID and GH_APP_PRIVATE_KEY) at its disposal. In my run, I simply replaced that with a PAT by doing const accessToken = ${{ secrets.DENNIS_PAT }}

dennisameling · 2022-12-19T21:53:10Z

.github/workflows/build-and-deploy.yml

@@ -37,7 +37,7 @@ env:

 jobs:
  build:
-    runs-on: windows-latest
+    runs-on: ${{ github.event.inputs.architecture == 'aarch64' && fromJSON('["Windows", "ARM64"]') || 'windows-latest' }}


I couldn't use env.ARCHITECTURE here so had to resort to github.event.inputs.architecture.

Right, the environment requires the runner to already run, and that requires runs-on to be specified ;-)

dscho

Very nice! I have just one minor request (dropping some unnecessary parentheses) and will be happy to merge this very soon.

dscho · 2022-12-20T16:17:30Z

.github/workflows/build-and-deploy.yml

@@ -135,6 +135,8 @@ jobs:
          flavor: ${{ env.PACKAGE_TO_BUILD == 'mingw-w64-git' && 'build-installers' || 'full' }}
          architecture: ${{ env.ARCHITECTURE || 'x86_64' }}
          msys: ${{ env.REPO == 'MSYS2-packages' || env.PACKAGE_TO_BUILD == 'git-for-windows-keyring' }}
+          # We only have to clean up on self-hosted runners
+          cleanup: ${{ (runner.arch == 'ARM64' && true) || false }}


I had a look at https://docs.github.com/en/actions/learn-github-actions/contexts#runner-context to see whether there would be any indication of a self-hosted runner, but did not find any. Pity.

If only we could detect whether we're running on a self-hosted, non-ephemeral runner, and set cleanup: true only then...

Would you mind losing the parentheses? We use the idiom 'A && B || C' (where &&/|| follow C++'s operator precedence order) quite often, without parentheses, so that it looks inconsistent when we use them here.

Would you mind losing the parentheses?

Done ✅ thanks for sharing the link to that documentation. I guess I got used to the no-mixed-operators rule in ESLint, which encourages using the parentheses to "clarfiy the developer’s intention" 😅

Ah, that's where that comes from. Yes, I am an unfan of that rule ;-)

dscho · 2022-12-20T16:24:42Z

.github/workflows/build-and-deploy.yml

@@ -37,7 +37,7 @@ env:

 jobs:
  build:
-    runs-on: windows-latest
+    runs-on: ${{ github.event.inputs.architecture == 'aarch64' && fromJSON('["Windows", "ARM64"]') || 'windows-latest' }}


Right, the environment requires the runner to already run, and that requires runs-on to be specified ;-)

Note that this only works for self-hosted runners. GitHub Actions will pick up and use the first available arm64 runner. Signed-off-by: Dennis Ameling <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>

dscho · 2022-12-22T20:28:28Z

.github/workflows/build-and-deploy.yml

@@ -209,8 +211,10 @@ jobs:
            printf '#!/bin/sh\n\nexec /mingw64/bin/git.exe "$@"\n' >/usr/bin/git
          } &&

+          MINGW_ARCHS_TO_BUILD=$(test "$ARCHITECTURE" == "aarch64" && echo "clangarm64" || echo "mingw32 mingw64")


@dennisameling I hope you don't mind that I edited this: We can either use a Bash-style ternary (with $ARCHITECTURE) or use GitHub workflow syntax (${{ env.ARCHITECTURE == 'aarch64' && 'clangarm64' || 'mingw32 mingw64' }}), but we should not mix them. I opted for the former.

Works for me! 👍🏼

dscho · 2022-12-22T20:32:40Z

Now I'm going to start the VM.

dscho · 2022-12-22T20:36:35Z

So exciting!!!

dennisameling · 2022-12-22T20:40:49Z

Yay!!!! So exciting indeed! 🚀

dscho · 2022-12-22T20:41:07Z

Ah... It failed because pacman needed to be upgraded. Let me see whether I can easily fix the sync workflow (running it manually did not work because the job was skipped).

dscho · 2022-12-22T23:38:50Z

Let me see whether I can easily fix the sync workflow

Finally it worked.

dscho · 2022-12-22T23:45:22Z

What did not work was the GPG step. I will have to leave it at that, for now.

dennisameling · 2022-12-23T09:27:03Z

Oh my 😅 that commit history looks really similar to my mess from testing yesterday haha. Thank you so much for going through that! I know it can be a total pain!

Let's say if I had some time next week and wanted to kick off the build-and-deploy pipeline for arm64 to build some of the packages (git-lfs, git-credential-manager, etc.) for the git-sdk-arm64, how would I go about that? I would either need:

Access to add (temporary) self-hosted runners to git-for-windows-automation (I currently can't do that, see screenshot below), so that I can at least add some initial package versions for those to git-sdk-arm64
Your permission to build those packages locally on my machine (with my code signing + GPG signing) and commit them to git-sdk-arm64.

WDYT?

dennisameling · 2022-12-24T15:33:35Z

What did not work was the GPG step. I will have to leave it at that, for now.

Fixed in #8 👍🏼

dscho · 2023-01-02T23:25:45Z

The fruit of all of your labor: https://wingit.blob.core.windows.net/aarch64/git-for-windows-aarch64.db

dennisameling commented Dec 19, 2022

View reviewed changes

dscho approved these changes Dec 20, 2022

View reviewed changes

dennisameling force-pushed the build-support-arm64 branch from 9892783 to fca9b6c Compare December 20, 2022 23:44

dscho mentioned this pull request Dec 22, 2022

Prepare for uploading Pacman packages targeting Windows/ARM64 git-for-windows/build-extra#458

Merged

build-and-deploy: add support for arm64 builds

119a90a

Note that this only works for self-hosted runners. GitHub Actions will pick up and use the first available arm64 runner. Signed-off-by: Dennis Ameling <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>

dscho force-pushed the build-support-arm64 branch from fca9b6c to 119a90a Compare December 22, 2022 20:24

dscho approved these changes Dec 22, 2022

View reviewed changes

dscho merged commit 254feea into git-for-windows:main Dec 22, 2022

dennisameling deleted the build-support-arm64 branch December 22, 2022 20:40

dennisameling mentioned this pull request Dec 24, 2022

build-and-deploy: arm64 fixes for GPG signing #8

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

build-and-deploy: add support for arm64 builds #4

build-and-deploy: add support for arm64 builds #4

dennisameling commented Dec 19, 2022

dennisameling Dec 19, 2022

dscho Dec 20, 2022

dscho left a comment

dscho Dec 20, 2022

dennisameling Dec 20, 2022

dscho Dec 22, 2022

dscho Dec 20, 2022

dscho Dec 22, 2022

dennisameling Dec 22, 2022

dscho commented Dec 22, 2022

dscho commented Dec 22, 2022

dennisameling commented Dec 22, 2022

dscho commented Dec 22, 2022

dscho commented Dec 22, 2022

dscho commented Dec 22, 2022

dennisameling commented Dec 23, 2022

dennisameling commented Dec 24, 2022

dscho commented Jan 2, 2023

build-and-deploy: add support for arm64 builds #4

build-and-deploy: add support for arm64 builds #4

Conversation

dennisameling commented Dec 19, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dscho left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dscho commented Dec 22, 2022

dscho commented Dec 22, 2022

dennisameling commented Dec 22, 2022

dscho commented Dec 22, 2022

dscho commented Dec 22, 2022

dscho commented Dec 22, 2022

dennisameling commented Dec 23, 2022

dennisameling commented Dec 24, 2022

dscho commented Jan 2, 2023