File tree Expand file tree Collapse file tree 2 files changed +3
-2
lines changed Expand file tree Collapse file tree 2 files changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ GIT_PREFIX := $(PREFIX)/git
21
21
# Replace -rc with .rc in the version string
22
22
# This is to ensure compatibility with the format as generated by GIT-VERSION-GEN
23
23
ORIGINAL_VERSION := $(VERSION )
24
- VERSION := $(shell echo $( ORIGINAL_VERSION ) | sed 's/ -rc/ .rc/g' )
24
+ VERSION := $(subst -rc, .rc, $( VERSION ) )
25
25
26
26
BUILD_DIR := $(GITHUB_WORKSPACE ) /payload
27
27
DESTDIR := $(PWD ) /stage/git-$(ARCH_UNIV ) -$(VERSION )
@@ -159,6 +159,6 @@ endif
159
159
ifdef APPLE_KEYCHAIN_PROFILE
160
160
notarize :
161
161
@$(CURDIR ) /../scripts/notarize.sh \
162
- --package=" disk-image/git-$( VERSION ) -$( ARCH_UNIV) .pkg" \
162
+ --package=" disk-image/git-$( ORIGINAL_VERSION ) -$( ARCH_UNIV) .pkg" \
163
163
--keychain-profile=" $( APPLE_KEYCHAIN_PROFILE) "
164
164
endif
Original file line number Diff line number Diff line change @@ -479,6 +479,7 @@ jobs:
479
479
480
480
# Convert -rc to .rc to match GIT-VERSION-FILE behavior
481
481
BUILD_VERSION=$(echo "${VERSION}" | sed 's/-rc/.rc/g')
482
+ echo "$BUILD_VERSION" >git/version
482
483
483
484
# Configure universal build
484
485
cat >git/config.mak <<EOF
You can’t perform that action at this time.
0 commit comments