fixup! release: add Mac OSX installer build

Author: mjcheetham

.github/macos-installer/Makefile

@@ -18,6 +18,11 @@ LDFLAGS := $(TARGET_FLAGS) $(ARCH_FLAGS)
 PREFIX := /usr/local
 GIT_PREFIX := $(PREFIX)/git
 
+# Replace -rc with .rc in the version string
+# This is to ensure compatibility with the format as generated by GIT-VERSION-GEN
+ORIGINAL_VERSION := $(VERSION)
+VERSION := $(shell echo $(ORIGINAL_VERSION) | sed 's/-rc/.rc/g')
+
 BUILD_DIR := $(GITHUB_WORKSPACE)/payload
 DESTDIR := $(PWD)/stage/git-$(ARCH_UNIV)-$(VERSION)
 ARTIFACTDIR := build-artifacts
@@ -124,23 +129,24 @@ ifdef APPLE_INSTALLER_IDENTITY
 	pkg_cmd += --sign "$(APPLE_INSTALLER_IDENTITY)"
 endif
 
-pkg_cmd += disk-image/git-$(VERSION)-$(ARCH_UNIV).pkg
-disk-image/git-$(VERSION)-$(ARCH_UNIV).pkg: disk-image/VERSION-$(VERSION)-$(ARCH_UNIV) symlinks
+pkg_cmd += disk-image/git-$(ORIGINAL_VERSION)-$(ARCH_UNIV).pkg
+
+disk-image/git-$(ORIGINAL_VERSION)-$(ARCH_UNIV).pkg: disk-image/VERSION-$(VERSION)-$(ARCH_UNIV) symlinks
 	$(pkg_cmd)
 
 git-%-$(ARCH_UNIV).dmg:
-	hdiutil create git-$(VERSION)-$(ARCH_UNIV).uncompressed.dmg -fs HFS+ -srcfolder disk-image -volname "Git $(VERSION) $(ARCH_UNIV)" -ov 2>&1 | tee err || { \
+	hdiutil create git-$(ORIGINAL_VERSION)-$(ARCH_UNIV).uncompressed.dmg -fs HFS+ -srcfolder disk-image -volname "Git $(ORIGINAL_VERSION) $(ARCH_UNIV)" -ov 2>&1 | tee err || { \
 		grep "Resource busy" err && \
 		sleep 5 && \
-		hdiutil create git-$(VERSION)-$(ARCH_UNIV).uncompressed.dmg -fs HFS+ -srcfolder disk-image -volname "Git $(VERSION) $(ARCH_UNIV)" -ov; }
-	hdiutil convert -format UDZO -o $@ git-$(VERSION)-$(ARCH_UNIV).uncompressed.dmg
-	rm -f git-$(VERSION)-$(ARCH_UNIV).uncompressed.dmg
+		hdiutil create git-$(ORIGINAL_VERSION)-$(ARCH_UNIV).uncompressed.dmg -fs HFS+ -srcfolder disk-image -volname "Git $(ORIGINAL_VERSION) $(ARCH_UNIV)" -ov; }
+	hdiutil convert -format UDZO -o $@ git-$(ORIGINAL_VERSION)-$(ARCH_UNIV).uncompressed.dmg
+	rm -f git-$(ORIGINAL_VERSION)-$(ARCH_UNIV).uncompressed.dmg
 
 payload: $(BUILD_DIR)/git-$(VERSION)/osx-installed $(BUILD_DIR)/git-$(VERSION)/osx-built-assert-$(ARCH_UNIV)
 
-pkg: disk-image/git-$(VERSION)-$(ARCH_UNIV).pkg
+pkg: disk-image/git-$(ORIGINAL_VERSION)-$(ARCH_UNIV).pkg
 
-image: git-$(VERSION)-$(ARCH_UNIV).dmg
+image: git-$(ORIGINAL_VERSION)-$(ARCH_UNIV).dmg
 
 ifdef APPLE_APP_IDENTITY
 codesign:

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

@@ -477,8 +477,8 @@ jobs:
           # Trace execution, stop on error
           set -ex
 
-          # Write to "version" file to force match with trigger payload version
-          echo "${{ needs.prereqs.outputs.tag_version }}" >>git/version
+          # Convert -rc to .rc to match GIT-VERSION-FILE behavior
+          BUILD_VERSION=$(echo "${VERSION}" | sed 's/-rc/.rc/g')
 
           # Configure universal build
           cat >git/config.mak <<EOF
@@ -516,15 +516,15 @@ jobs:
 
           # 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"