Skip to content

Enable building of release candidate builds #788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mjcheetham merged 2 commits into from
Sep 3, 2025
Merged

Enable building of release candidate builds #788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f54f6b
fixup! release: add Mac OSX installer build
mjcheetham Sep 3, 2025
5ef482b
fixup! release: build unsigned Ubuntu .deb package
mjcheetham Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/macos-installer/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ 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')
VERSION := $(subst -rc,.rc,$(VERSION))

BUILD_DIR := $(GITHUB_WORKSPACE)/payload
DESTDIR := $(PWD)/stage/git-$(ARCH_UNIV)-$(VERSION)
Expand Down Expand Up @@ -159,6 +159,6 @@ endif
ifdef APPLE_KEYCHAIN_PROFILE
notarize:
@$(CURDIR)/../scripts/notarize.sh \
--package="disk-image/git-$(VERSION)-$(ARCH_UNIV).pkg" \
--package="disk-image/git-$(ORIGINAL_VERSION)-$(ARCH_UNIV).pkg" \
--keychain-profile="$(APPLE_KEYCHAIN_PROFILE)"
endif
5 changes: 5 additions & 0 deletions .github/workflows/build-git-installers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,7 @@ jobs:

# Convert -rc to .rc to match GIT-VERSION-FILE behavior
BUILD_VERSION=$(echo "${VERSION}" | sed 's/-rc/.rc/g')
echo "$BUILD_VERSION" >git/version

# Configure universal build
cat >git/config.mak <<EOF
Expand Down Expand Up @@ -601,6 +602,10 @@ jobs:
}

VERSION="${{ needs.prereqs.outputs.tag_version }}"

# Convert -rc to .rc to match GIT-VERSION-FILE 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)"
Expand Down
Loading