Merge branch 'support-MINGW-and-MSYS2-packages'

Support building packages whose definitions live in `MINGW-packages` and
`MSYS2-packages`, respectively.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

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

@@ -1,5 +1,5 @@
 name: build-and-deploy
-run-name: Build${{ inputs.build_only == '' && ' and deploy' || '' }} ${{ inputs.package }}
+run-name: Build${{ inputs.build_only == '' && ' and deploy' || '' }} ${{ !startsWith(inputs.package, 'mingw-w64-') && inputs.repo != 'MSYS2-packages' && inputs.package != 'git-extra' && inputs.package != 'git-for-windows-keyring' && 'mingw-w64-' || '' }}${{ inputs.package }}${{ inputs.architecture && ' (${{ inputs.architecture }})' || '' }}
 
 on:
   workflow_dispatch:
@@ -16,6 +16,9 @@ on:
       ref:
         description: 'The ref containing the package definition'
         required: true
+      architecture:
+        description: 'The architecture to build for (only for MSYS packages)'
+        required: false
       actor:
         description: The GitHub user on whose behalf this workflow is run
         required: false
@@ -26,9 +29,11 @@ env:
   OWNER: "git-for-windows"
   REPO: "${{ github.event.inputs.repo }}"
   REF: "${{ github.event.inputs.ref }}"
+  ARCHITECTURE: "${{ github.event.inputs.architecture }}"
   GPG_OPTIONS: "--batch --yes --no-tty --list-options no-show-photos --verify-options no-show-photos --pinentry-mode loopback"
   HOME: "${{ github.workspace }}\\home"
   ACTOR: "${{ github.event.inputs.actor || github.triggering_actor }}"
+  CREATE_CHECK_RUN: true
 
 jobs:
   build:
@@ -44,6 +49,7 @@ jobs:
         # Therefore, we registered a GitHub App and stored the data required to
         # act as that App in repository secrets `GH_APP_ID`, `GH_APP_PRIVATE_KEY`.
       - name: Obtain installation token
+        if: env.CREATE_CHECK_RUN != 'false'
         id: setup
         uses: actions/github-script@v6
         with:
@@ -72,6 +78,7 @@ jobs:
             core.setOutput('token', accessToken)
 
       - name: get check run id
+        if: env.CREATE_CHECK_RUN != 'false'
         id: check-run
         uses: actions/github-script@v6
         with:
@@ -114,24 +121,34 @@ jobs:
           git config --global user.name "$USER_NAME" &&
           git config --global user.email "$USER_EMAIL" &&
           echo "PACKAGER=$USER_NAME <$USER_EMAIL>" >>$GITHUB_ENV &&
-          if test git-extra != "$PACKAGE_TO_BUILD" && test "z${PACKAGE_TO_BUILD#mingw-w64-}" = "z$PACKAGE_TO_BUILD"
+          if test MSYS2-packages != "$REPO" &&
+            test git-extra != "$PACKAGE_TO_BUILD" &&
+            test git-for-windows-keyring != "$PACKAGE_TO_BUILD" &&
+            test "z${PACKAGE_TO_BUILD#mingw-w64-}" = "z$PACKAGE_TO_BUILD"
           then
             echo "PACKAGE_TO_BUILD=mingw-w64-$PACKAGE_TO_BUILD" >>$GITHUB_ENV
           fi
 
       - name: Download Git for Windows SDK
         uses: git-for-windows/setup-git-for-windows-sdk@v1
         with:
-          flavor: full
+          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' }}
 
-      - name: Clone build-extra
+      - name: Clone ${{ env.REPO }}
         shell: bash
         run: |
           mkdir -p /usr/src &&
-          git init -b main /usr/src/build-extra &&
-          git -C /usr/src/build-extra remote add origin "https://github.com/$OWNER/$REPO" &&
-          git -C /usr/src/build-extra fetch --depth 1 origin $REF &&
-          git -C /usr/src/build-extra switch -d FETCH_HEAD
+          git init -b main /usr/src/${{ env.REPO }} &&
+          git -C /usr/src/${{ env.REPO }} remote add origin "https://github.com/$OWNER/$REPO" &&
+          git -C /usr/src/${{ env.REPO }} fetch --depth 1 origin $REF &&
+          git -C /usr/src/${{ env.REPO }} reset --hard FETCH_HEAD
+
+      - name: Clone build-extra (unless cloned already)
+        if: env.REPO != 'build-extra'
+        shell: bash
+        run: git clone --depth 1 --single-branch -b main https://github.com/git-for-windows/build-extra /usr/src/build-extra
 
       - name: pacman -Syyu
         shell: bash
@@ -176,19 +193,27 @@ jobs:
           echo "$CODESIGN_P12" | tr % '\n' | base64 -d >home/.sig/codesign.p12 &&
           echo "$CODESIGN_PASS" >home/.sig/codesign.pass
           git config --global alias.signtool '!sh "/usr/src/build-extra/signtool.sh"'
+          echo "SIGNTOOL=git signtool" >>$GITHUB_ENV
 
       - name: Build ${{env.PACKAGE_TO_BUILD}}
         env:
           GPGKEY: ${{secrets.GPGKEY}}
+          MAKEPKG: ${{ env.REPO != 'MSYS2-packages' && env.PACKAGE_TO_BUILD != 'git-for-windows-keyring' && 'makepkg-mingw' || 'makepkg' }}
         shell: bash
         run: |
           dir="$(cygpath -au artifacts)" &&
           mkdir -p "$dir" &&
+
+          {
+            test -f /usr/bin/git ||
+            printf '#!/bin/sh\n\nexec /mingw64/bin/git.exe "$@"\n' >/usr/bin/git
+          } &&
+
           cd "/usr/src/$REPO/$PACKAGE_TO_BUILD" &&
-          MAKEFLAGS=-j6 PKGEXT='.pkg.tar.xz' MINGW_ARCH="mingw32 mingw64" makepkg-mingw -s --noconfirm &&
+          MAKEFLAGS=-j6 PKGEXT='.pkg.tar.xz' MINGW_ARCH="mingw32 mingw64" $MAKEPKG -s --noconfirm &&
           cp *.pkg.tar* "$dir/" &&
 
-          MAKEFLAGS=-j6 SRCEXT='.src.tar.gz' MINGW_ARCH=mingw64 makepkg-mingw --allsource &&
+          MAKEFLAGS=-j6 SRCEXT='.src.tar.gz' MINGW_ARCH=mingw64 $MAKEPKG --allsource &&
           cp *.src.tar* "$dir/" &&
 
           # Ensure that the Git worktree is still clean
@@ -203,6 +228,7 @@ jobs:
           fi
 
       - name: update check-run
+        if: env.CREATE_CHECK_RUN != 'false'
         uses: actions/github-script@v6
         with:
           script: |
@@ -231,7 +257,7 @@ jobs:
           echo "::add-mask::$(echo "$AZURE_BLOBS_TOKEN" | base64 -w 0)" &&
           echo "$AZURE_BLOBS_TOKEN" >"$HOME"/.azure-blobs-token
 
-      - name: Deploy Pacman packages
+      - name: ${{ env.BUILD_ONLY == 'true' && 'Test-deploy' || 'Deploy' }} Pacman packages
         if: env.BUILD_ONLY == 'true' || env.AZURE_BLOBS_TOKEN != ''
         shell: bash
         env:
@@ -246,7 +272,7 @@ jobs:
         run: rm -rf home
 
       - name: mark check run as completed
-        if: always()
+        if: env.CREATE_CHECK_RUN != 'false' && always()
         uses: actions/github-script@v6
         with:
           script: |