Browse Source

Rework calculation of branch for release make targets (#1507)

pull/1508/head
trapexit 2 months ago
committed by GitHub
parent
commit
24e778b95a
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 17
      Makefile

17
Makefile

@ -29,6 +29,7 @@ TAR ?= tar
TOUCH ?= touch TOUCH ?= touch
BUILDDIR := build BUILDDIR := build
GITREF = $(shell git describe --exact-match --tags HEAD 2>/dev/null || git symbolic-ref --short HEAD 2>/dev/null || git rev-parse --short HEAD)
ifndef GIT_REPO ifndef GIT_REPO
ifneq ($(shell $(GIT) --version 2> /dev/null),) ifneq ($(shell $(GIT) --version 2> /dev/null),)
@ -302,56 +303,56 @@ release:
./buildtools/build-release \ ./buildtools/build-release \
--target=all \ --target=all \
$(if $(CLEANUP),--cleanup) \ $(if $(CLEANUP),--cleanup) \
--branch=$(shell git branch --show-current)
--branch=$(GITREF)
.PHONY: release-sample .PHONY: release-sample
release-sample: release-sample:
./buildtools/build-release \ ./buildtools/build-release \
--target=debian.12.amd64 \ --target=debian.12.amd64 \
$(if $(CLEANUP),--cleanup) \ $(if $(CLEANUP),--cleanup) \
--branch=$(shell git branch --show-current)
--branch=$(GITREF)
.PHONY: release-amd64 .PHONY: release-amd64
release-amd64: release-amd64:
./buildtools/build-release \ ./buildtools/build-release \
--target=amd64 \ --target=amd64 \
$(if $(CLEANUP),--cleanup) \ $(if $(CLEANUP),--cleanup) \
--branch=$(shell git branch --show-current)
--branch=$(GITREF)
.PHONY: release-arm64 .PHONY: release-arm64
release-arm64: release-arm64:
./buildtools/build-release \ ./buildtools/build-release \
--target=arm64 \ --target=arm64 \
$(if $(CLEANUP),--cleanup) \ $(if $(CLEANUP),--cleanup) \
--branch=$(shell git branch --show-current)
--branch=$(GITREF)
.PHONY: release-riscv64 .PHONY: release-riscv64
release-riscv64: release-riscv64:
./buildtools/build-release \ ./buildtools/build-release \
--target=riscv64 \ --target=riscv64 \
$(if $(CLEANUP),--cleanup) \ $(if $(CLEANUP),--cleanup) \
--branch=$(shell git branch --show-current)
--branch=$(GITREF)
.PHONY: release-armhf .PHONY: release-armhf
release-armhf: release-armhf:
./buildtools/build-release \ ./buildtools/build-release \
--target=armhf \ --target=armhf \
$(if $(CLEANUP),--cleanup) \ $(if $(CLEANUP),--cleanup) \
--branch=$(shell git branch --show-current)
--branch=$(GITREF)
.PHONY: release-static .PHONY: release-static
release-static: release-static:
./buildtools/build-release \ ./buildtools/build-release \
--target=static \ --target=static \
$(if $(CLEANUP),--cleanup) \ $(if $(CLEANUP),--cleanup) \
--branch=$(shell git branch --show-current)
--branch=$(GITREF)
.PHONY: release-tarball .PHONY: release-tarball
release-tarball: release-tarball:
./buildtools/build-release \ ./buildtools/build-release \
--target=tarball \ --target=tarball \
$(if $(CLEANUP),--cleanup) \ $(if $(CLEANUP),--cleanup) \
--branch=$(shell git branch --show-current)
--branch=$(GITREF)
.PHONY: tags .PHONY: tags

Loading…
Cancel
Save