Skip to content

Commit 094f8f6

Browse files
committed
please.sh build-mingw-w64-git: assume that all dependencies are installed
The idea of having `git-sdk-*` repositories that track full MSYS2 environments is not only to have a convenient and fast way to bootstrap a build environment in which to build and release Git for Windows, it also enables straight-forward processes for embargoed builds, where we have to "time-travel" back to the state from which the preceding version was built and assembled. To guarantee that this time traveling continues to work, the build process of a regular Git for Windows release must be prevented from "conveniently" installing missing dependencies; If they are not part of the `git-sdk-*` repository (or not in the `build-installers` sparse checkout), that needs to be changed before releasing, so that the embargoed release process can continue to work as intended. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 94bacaf commit 094f8f6

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

please.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3428,6 +3428,7 @@ build_mingw_w64_git () { # [--only-i686] [--only-x86_64] [--only-aarch64] [--ski
34283428
sed_makepkg_e=
34293429
force=
34303430
src_pkg=
3431+
maybe_sync=
34313432
while case "$1" in
34323433
--only-i686|--only-32-bit)
34333434
MINGW_ARCH=mingw32
@@ -3469,6 +3470,9 @@ build_mingw_w64_git () { # [--only-i686] [--only-x86_64] [--only-aarch64] [--ski
34693470
-o*)
34703471
output_path="$(cygpath -am "${1#-?}")" || exit
34713472
;;
3473+
--maybe-sync|-s)
3474+
maybe_sync="-s --noconfirm"
3475+
;;
34723476
-*) die "Unknown option: %s\n" "$1";;
34733477
*) break;;
34743478
esac; do shift; done
@@ -3533,7 +3537,7 @@ build_mingw_w64_git () { # [--only-i686] [--only-x86_64] [--only-aarch64] [--ski
35333537
export SIGNTOOL="git ${d:+--git-dir="$d"} signtool"
35343538
fi &&
35353539
cd ${git_src_dir%/src/git}/ &&
3536-
MAKEFLAGS=${MAKEFLAGS:--j$(nproc)} makepkg-mingw -s --noconfirm $force -p PKGBUILD.$tag &&
3540+
MAKEFLAGS=${MAKEFLAGS:--j$(nproc)} makepkg-mingw $maybe_sync $force -p PKGBUILD.$tag &&
35373541
if test -n "$src_pkg"
35383542
then
35393543
git --git-dir src/git/.git archive --prefix git/ -o git-$tag.tar.gz $tag &&

0 commit comments

Comments
 (0)