Skip to content

Commit 9f54f6b

Browse files
committed
fixup! release: add Mac OSX installer build
1 parent 999f50c commit 9f54f6b

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.github/macos-installer/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ GIT_PREFIX := $(PREFIX)/git
2121
# Replace -rc with .rc in the version string
2222
# This is to ensure compatibility with the format as generated by GIT-VERSION-GEN
2323
ORIGINAL_VERSION := $(VERSION)
24-
VERSION := $(shell echo $(ORIGINAL_VERSION) | sed 's/-rc/.rc/g')
24+
VERSION := $(subst -rc,.rc,$(VERSION))
2525

2626
BUILD_DIR := $(GITHUB_WORKSPACE)/payload
2727
DESTDIR := $(PWD)/stage/git-$(ARCH_UNIV)-$(VERSION)
@@ -159,6 +159,6 @@ endif
159159
ifdef APPLE_KEYCHAIN_PROFILE
160160
notarize:
161161
@$(CURDIR)/../scripts/notarize.sh \
162-
--package="disk-image/git-$(VERSION)-$(ARCH_UNIV).pkg" \
162+
--package="disk-image/git-$(ORIGINAL_VERSION)-$(ARCH_UNIV).pkg" \
163163
--keychain-profile="$(APPLE_KEYCHAIN_PROFILE)"
164164
endif

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,7 @@ jobs:
479479
480480
# Convert -rc to .rc to match GIT-VERSION-FILE behavior
481481
BUILD_VERSION=$(echo "${VERSION}" | sed 's/-rc/.rc/g')
482+
echo "$BUILD_VERSION" >git/version
482483
483484
# Configure universal build
484485
cat >git/config.mak <<EOF

0 commit comments

Comments
 (0)