Skip to content

Commit b38a9eb

Browse files
vdyedscho
authored andcommitted
release: include GIT_BUILT_FROM_COMMIT in MacOS build
Set the `GIT_BUILT_FROM_COMMIT` based on the version specified in the `make dist` output archive header. This ensures the commit hash is shown in `git version --build-options`. Signed-off-by: Victoria Dye <[email protected]>
1 parent f52896a commit b38a9eb

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

.github/macos-installer/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ VERSION := $(shell echo $(ORIGINAL_VERSION) | sed 's/-rc/.rc/g')
2626
BUILD_DIR := $(GITHUB_WORKSPACE)/payload
2727
DESTDIR := $(PWD)/stage/git-$(ARCH_UNIV)-$(VERSION)
2828
ARTIFACTDIR := build-artifacts
29-
SUBMAKE := $(MAKE) C_INCLUDE_PATH="$(C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(CPLUS_INCLUDE_PATH)" LD_LIBRARY_PATH="$(LD_LIBRARY_PATH)" TARGET_FLAGS="$(TARGET_FLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" NO_GETTEXT=1 NO_DARWIN_PORTS=1 prefix=$(GIT_PREFIX) DESTDIR=$(DESTDIR)
29+
SUBMAKE := $(MAKE) C_INCLUDE_PATH="$(C_INCLUDE_PATH)" CPLUS_INCLUDE_PATH="$(CPLUS_INCLUDE_PATH)" LD_LIBRARY_PATH="$(LD_LIBRARY_PATH)" TARGET_FLAGS="$(TARGET_FLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" NO_GETTEXT=1 NO_DARWIN_PORTS=1 prefix=$(GIT_PREFIX) GIT_BUILT_FROM_COMMIT="$(GIT_BUILT_FROM_COMMIT)" DESTDIR=$(DESTDIR)
3030
CORES := $(shell bash -c "sysctl hw.ncpu | awk '{print \$$2}'")
3131

3232
# Guard against environment variables

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,9 @@ jobs:
511511
512512
make -C git -j$(sysctl -n hw.physicalcpu) GIT-VERSION-FILE dist dist-doc
513513
514+
export GIT_BUILT_FROM_COMMIT=$(gunzip -c git/git-$BUILD_VERSION.tar.gz | git get-tar-commit-id) ||
515+
die "Could not determine commit for build"
516+
514517
# Extract tarballs
515518
mkdir payload manpages
516519
tar -xvf git/git-$BUILD_VERSION.tar.gz -C payload

0 commit comments

Comments
 (0)