fixup! release: create initial Windows installer build workflow

Update the tag version validation to correctly look for release
candidates in the version string. The `rcN` part optionally appears
after x.y.z[.rcN] and not at the end of the entire VFS-version string.

Also note that the tag looks like `-rcN` (with a dash), but the output
from the version generation script is `.rcN` (with a period).

Signed-off-by: Matthew John Cheetham <mjcheetham@outlook.com>

Author: mjcheetham

.github/workflows/build-git-installers.yml

@@ -23,8 +23,8 @@ jobs:
       - name: Validate tag
         run: |
           echo "$GITHUB_REF" |
-          grep -E '^refs/tags/v2\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.vfs\.0\.(0|[1-9][0-9]*)(\.rc[0-9])?$' || {
-            echo "::error::${GITHUB_REF#refs/tags/} is not of the form v2.<X>.<Y>.vfs.0.<W>[.rc<N>]" >&2
+            grep -E '^refs/tags/v2\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-rc[0-9]+)?\.vfs\.0\.(0|[1-9][0-9]*)$' || {
+            echo "::error::${GITHUB_REF#refs/tags/} is not of the form v2.<X>.<Y>[-rc<N>].vfs.0.<W>" >&2
             exit 1
           }
       - name: Determine tag to build
@@ -49,8 +49,11 @@ jobs:
 
           # Verify tag follows rules in GIT-VERSION-GEN (i.e., matches the specified "DEF_VER" in
           # GIT-VERSION-FILE) and matches tag determined from trigger
-          make GIT-VERSION-FILE
-          test "${{ steps.tag.outputs.version }}" == "$(sed -n 's/^GIT_VERSION *= *//p'< GIT-VERSION-FILE)" || die "GIT-VERSION-FILE tag ($(cat GIT-VERSION-FILE)) does not match ${{ steps.tag.outputs.name }}"
+            make GIT-VERSION-FILE
+            expected_version="${{ steps.tag.outputs.version }}"
+            # Convert -rc to .rc to match GIT-VERSION-FILE format
+            expected_version="${expected_version//-rc/.rc}"
+            test "$expected_version" == "$(sed -n 's/^GIT_VERSION *= *//p'< GIT-VERSION-FILE)" || die "GIT-VERSION-FILE tag ($(cat GIT-VERSION-FILE)) does not match ${{ steps.tag.outputs.name }}"
   # End check prerequisites for the workflow
 
   # Build Windows installers (x86_64 & aarch64; installer & portable)
@@ -474,8 +477,11 @@ jobs:
           # Trace execution, stop on error
           set -ex
 
+          # Convert -rc to .rc to match GIT-VERSION-FILE behavior
+          BUILD_VERSION=$(echo "${VERSION}" | sed 's/-rc/.rc/g')
+
           # Write to "version" file to force match with trigger payload version
-          echo "${{ needs.prereqs.outputs.tag_version }}" >>git/version
+          echo "${BUILD_VERSION}" >>git/version
 
           # Configure universal build
           cat >git/config.mak <<EOF
@@ -508,20 +514,20 @@ jobs:
 
           make -C git -j$(sysctl -n hw.physicalcpu) GIT-VERSION-FILE dist dist-doc
 
-          export GIT_BUILT_FROM_COMMIT=$(gunzip -c git/git-$VERSION.tar.gz | git get-tar-commit-id) ||
+          export GIT_BUILT_FROM_COMMIT=$(gunzip -c git/git-$BUILD_VERSION.tar.gz | git get-tar-commit-id) ||
             die "Could not determine commit for build"
 
           # Extract tarballs
           mkdir payload manpages
-          tar -xvf git/git-$VERSION.tar.gz -C payload
-          tar -xvf git/git-manpages-$VERSION.tar.gz -C manpages
+          tar -xvf git/git-$BUILD_VERSION.tar.gz -C payload
+          tar -xvf git/git-manpages-$BUILD_VERSION.tar.gz -C manpages
 
           # Lay out payload
-          cp git/config.mak payload/git-$VERSION/config.mak
+          cp git/config.mak payload/git-$BUILD_VERSION/config.mak
           make -C git/.github/macos-installer V=1 payload
 
           # Codesign payload
-          cp -R stage/git-universal-$VERSION/ \
+          cp -R stage/git-universal-$BUILD_VERSION/ \
             git/.github/macos-installer/build-artifacts
           make -C git/.github/macos-installer V=1 codesign \
             APPLE_APP_IDENTITY='${{ steps.signing-secrets.outputs.appsign-id }}' || die "Creating signed payload failed"
@@ -597,11 +603,14 @@ jobs:
               exit 1
           }
 
-          echo "${{ needs.prereqs.outputs.tag_version }}" >>git/version
-          make -C git GIT-VERSION-FILE
-
           VERSION="${{ needs.prereqs.outputs.tag_version }}"
 
+          # Convert -rc to .rc to match GIT-VERSION-GEN behavior
+          BUILD_VERSION=$(echo "$VERSION" | sed 's/-rc/.rc/g')
+          echo "${BUILD_VERSION}" >>git/version
+
+          make -C git GIT-VERSION-FILE
+
           ARCH="$(dpkg-architecture -q DEB_HOST_ARCH)"
           if test -z "$ARCH"; then
             die "Could not determine host architecture!"
@@ -768,7 +777,7 @@ jobs:
         shell: bash
         run: |
           "${{ matrix.component.command }}" --version | sed 's/git version //' >actual
-          echo ${{ needs.prereqs.outputs.tag_version }} >expect
+          echo "${{ needs.prereqs.outputs.tag_version }}" | sed 's/-rc/.rc/g' >expect
           cmp expect actual || exit 1
 
       - name: Validate universal binary CPU architecture