Start using new git-extra prefix

[dennisameling]

This depends on #457 being merged first, as it removes a lot of code that we'd otherwise have to update.

I used the list of files that need updating from this comment (thanks @dscho!)

[dennisameling]

Test results of please.sh and commit-msys2.sh changes

I tested this locally by basically mimicking sync.yml:

sh -x usr/src/build-extra/please.sh sync --force --only-64-bit
sh -x /usr/src/build-extra/commit-msys2.sh commit

The resulting commit looks good to me:

$ git show 64498be630d1dc0003beefa306cdb28302f47d28
commit 64498be630d1dc0003beefa306cdb28302f47d28 (HEAD -> main)
Author: Dennis Ameling <dennis@dennisameling.com>
Date:   Tue Dec 27 21:54:32 2022 +0100

    Update 1 package

    git-extra (1.1.616.3f26b1b0c-1 -> 1.1.616.3f26b1b0c-1)

    Signed-off-by: Dennis Ameling <dennis@dennisameling.com>

diff --git a/var/lib/pacman/local/git-extra-1.1.616.3f26b1b0c-1/mtree b/var/lib/pacman/local/git-extra-1.1.616.3f26b1b0c-1/mtree
deleted file mode 100644
index 9fb27af6af..0000000000
Binary files a/var/lib/pacman/local/git-extra-1.1.616.3f26b1b0c-1/mtree and /dev/null differ
diff --git a/var/lib/pacman/local/git-extra-1.1.616.3f26b1b0c-1/desc b/var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.616.3f26b1b0c-1/desc
similarity index 93%
rename from var/lib/pacman/local/git-extra-1.1.616.3f26b1b0c-1/desc
rename to var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.616.3f26b1b0c-1/desc
index 9379cd8aea..f84650410c 100644
--- a/var/lib/pacman/local/git-extra-1.1.616.3f26b1b0c-1/desc
+++ b/var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.616.3f26b1b0c-1/desc
@@ -1,5 +1,5 @@
 %NAME%
-git-extra
+mingw-w64-x86_64-git-extra

 %VERSION%
 1.1.616.3f26b1b0c-1
@@ -14,13 +14,13 @@ Git for Windows extra files
 https://github.com/git-for-windows/build-extra

 %ARCH%
-x86_64
+any

 %BUILDDATE%
 1671657907

 %INSTALLDATE%
-1672110153
+1672174026

 %PACKAGER%
 Johannes Schindelin <johannes.schindelin@gmx.de>
@@ -46,7 +46,10 @@ vim
 filesystem

 %CONFLICTS%
+git-extra
 mingw-w64-clang-aarch64-git-extra
-mingw-w64-x86_64-git-extra
 mingw-w64-i686-git-extra

+%PROVIDES%
+git-extra
+
diff --git a/var/lib/pacman/local/git-extra-1.1.616.3f26b1b0c-1/files b/var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.616.3f26b1b0c-1/files
similarity index 100%
rename from var/lib/pacman/local/git-extra-1.1.616.3f26b1b0c-1/files
rename to var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.616.3f26b1b0c-1/files
diff --git a/var/lib/pacman/local/git-extra-1.1.616.3f26b1b0c-1/install b/var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.616.3f26b1b0c-1/install
similarity index 100%
rename from var/lib/pacman/local/git-extra-1.1.616.3f26b1b0c-1/install
rename to var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.616.3f26b1b0c-1/install
diff --git a/var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.616.3f26b1b0c-1/mtree b/var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.616.3f26b1b0c-1/mtree
new file mode 100644
index 0000000000..c7d0d7279f

[dennisameling]

Test results of update-via-pacman.bat changes

When the package was built, the appropriate part of update-via-pacman.bat was updated correctly as well:

:FINISH
@ECHO Wrapping up: re-install mingw-w64-x86_64-git-extra
@pacman -S --noconfirm mingw-w64-x86_64-git-extra
@ECHO End of re-install of mingw-w64-x86_64-git-extra
@ECHO ==
@IF ERRORLEVEL 1 GOTO DIE

Here's the artifact in case you're interested:
git-extra-1.1.618.d98adb1b8-1-x86_64.pkg.tar.zip

[dscho]

We will also have to take care of git-sdk-arm64's sync job, but that can only happen once we register the aarch64 Pacman repository.

[dscho]

The canonical way to do this is to have a update-via-pacman.bat.in script and generate the update-via-pacman.bat version from it. Also, could we use GIT_EXTRA_PACKAGE_NAME instead of the less-descriptive PACKAGE_NAME?

[dennisameling]

Makes sense - in 6746dc5, I went with an approach to copy update-via-pacman.bat into the build folder instead of the startdir, as its contents will be different for every architecture. So we'll only have an update-via-pacman.bat.in in the startdir moving forward. WDYT?

[dscho]

So we'll only have an update-via-pacman.bat.in in the startdir moving forward. WDYT?

@dennisameling sounds good! TBH I hope that we can soon replace update-via-pacman.bat with the .ps1 script from git-for-windows/git-sdk-arm64#4 (meaning: we can simply delete it from git-extra, as the script will live directly in the respective git-sdk-* repository).

[dscho]

Wonderful!

[dscho]

/deploy git-extra

The i686/x86_64 and the arm64 workflow runs were started.