build-and-deploy: several optimizations, mostly to facilitate arm64 workflows #25
Conversation
Obviously, the git-sdk-arm64 doesn't have /mingw64/bin/git.exe. Building the source files using MINGW_ARCH=mingw64 also isn't going to work. Let's update the logic a bit to account for this scenario.
Now that all packages have an intial version for arm64, there's no need for this logic anymore. Let's get rid of it. Signed-off-by: Dennis Ameling <[email protected]>
As we use ephemeral runners for arm64 now, there's no need to clean up the SDK after the workflow run anymore. Let's get rid of that logic so we save ~20 seconds at the end of the workflow run. Signed-off-by: Dennis Ameling <[email protected]>
| { | ||
| test -f /usr/bin/git || | ||
| printf '#!/bin/sh\n\nexec /mingw64/bin/git.exe "$@"\n' >/usr/bin/git | ||
| printf '#!/bin/sh\n\nexec '$GIT_EXE' "$@"\n' >/usr/bin/git |
There was a problem hiding this comment.
I think we could theoretically use $MINGW_PREFIX/bin/git.exe instead of setting $GIT_EXE in that case.
| GIT_EXE="/mingw64/bin/git.exe" | ||
| BUILD_SRC="YesPlease" | ||
| ;; | ||
| esac && |
There was a problem hiding this comment.
Shouldn't we have an x86_64 arm and an i686 arm in this case statement, and a *) arm that errors out?
Also, here would be a fine spot to define MINGW_PREFIX, probably instead of GIT_EXE.
Lastly, given how much time it takes to build the source package, maybe we should consider yet another "ARCHITECTURE" called sources?
There was a problem hiding this comment.
I'm a bit confused about this one. The build-and-deploy pipeline is currently designed in a way that it uses a single windows-latest runner (x86_64) to build both mingw32 and mingw64 packages in one go. That's why I set up the logic this way.
How would you like to move forward here? Do we want to go for the "one arch, one pipeline" approach like we have in the upcoming git-artifacts pipeline? We'd also use the git-sdk-32 in that case on i686, which has proven to work just fine for mingw-w64-git.
If we can agree on how we want to proceed here, I'll implement the MINGW_PREFIX, "special ARCHITECTURE for sources" and i686/aarch64 in various commits 👍🏼
There was a problem hiding this comment.
The
build-and-deploypipeline is currently designed in a way that it uses a singlewindows-latestrunner (x86_64) to build bothmingw32andmingw64packages in one go. That's why I set up the logic this way.
Oh whoops. I totally was thinking about the git-artifacts workflow when I said this last night.
In light of that, even the MINGW_PREFIX suggestion does not make sense to me any longer, because there would have to be two such prefixes in the non-ARM64 case.
So I retract my suggestions 😁
| test ebe6c944c573ee4d8900f0e015365468606c9e1e != "$REF" || | ||
| test "mingw32 mingw64 clangarm64" != "$MINGW_ARCHS_TO_BUILD" || | ||
| MINGW_ARCHS_TO_BUILD=clangarm64 | ||
|
|
Successful run that includes these changes: https://github.com/git-for-windows/git-for-windows-automation/actions/runs/4114193682