-
Notifications
You must be signed in to change notification settings - Fork 14
build-and-deploy: several optimizations, mostly to facilitate arm64 workflows #25
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 |
---|---|---|
|
@@ -250,9 +250,20 @@ jobs: | |
dir="$(cygpath -au artifacts)" && | ||
mkdir -p "$dir" && | ||
|
||
case "$ARCHITECTURE" in | ||
aarch64) | ||
GIT_EXE="/clangarm64/bin/git.exe" | ||
BUILD_SRC= | ||
;; | ||
*) | ||
GIT_EXE="/mingw64/bin/git.exe" | ||
BUILD_SRC="YesPlease" | ||
;; | ||
esac && | ||
|
||
{ | ||
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. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think we could theoretically use There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'd like that, too. |
||
} && | ||
|
||
MINGW_ARCHS_TO_BUILD=$( | ||
|
@@ -275,8 +286,11 @@ jobs: | |
MAKEFLAGS=-j6 PKGEXT='.pkg.tar.xz' MINGW_ARCH=$MINGW_ARCHS_TO_BUILD $MAKEPKG -s --noconfirm && | ||
cp *.pkg.tar* "$dir/" && | ||
|
||
MAKEFLAGS=-j6 SRCEXT='.src.tar.gz' MINGW_ARCH=mingw64 $MAKEPKG --allsource && | ||
cp *.src.tar* "$dir/" && | ||
if test -n "$BUILD_SRC" | ||
then | ||
MAKEFLAGS=-j6 SRCEXT='.src.tar.gz' MINGW_ARCH=mingw64 $MAKEPKG --allsource && | ||
cp *.src.tar* "$dir/" | ||
fi && | ||
|
||
# Ensure that the Git worktree is still clean | ||
ls -la && | ||
|
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.
Shouldn't we have an
x86_64
arm and ani686
arm in thiscase
statement, and a*)
arm that errors out?Also, here would be a fine spot to define
MINGW_PREFIX
, probably instead ofGIT_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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm a bit confused about this one. The
build-and-deploy
pipeline is currently designed in a way that it uses a singlewindows-latest
runner (x86_64
) to build bothmingw32
andmingw64
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 thegit-sdk-32
in that case oni686
, which has proven to work just fine formingw-w64-git
.If we can agree on how we want to proceed here, I'll implement the
MINGW_PREFIX
, "specialARCHITECTURE
forsources
" andi686
/aarch64
in various commits 👍🏼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.
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 😁