From 36f28ce72e59d643887fc43b99d0034a6f67e4c9 Mon Sep 17 00:00:00 2001 From: Zach Hoffman Date: Wed, 10 Jan 2024 13:44:25 -0700 Subject: [PATCH] Include --long to always get relative commit count --- build/functions.sh | 2 +- docs/source/api/v3/about.rst | 2 +- docs/source/api/v4/about.rst | 2 +- docs/source/api/v5/about.rst | 2 +- experimental/traffic-portal/server.config.ts | 2 +- infrastructure/cdn-in-a-box/Makefile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/functions.sh b/build/functions.sh index 2904cbc53f..718516d833 100755 --- a/build/functions.sh +++ b/build/functions.sh @@ -94,7 +94,7 @@ getBuildNumber() { if isInGitTree; then local commits sha # The number of commits since the last tag - if ! commits="$(git describe --tags \ + if ! commits="$(git describe --long --tags \ --match='RELEASE-[0-9].[0-9].[0-9]' \ --match='RELEASE-[0-9][0-9].[0-9][0-9].[0-9][0-9]' \ --match='v[0-9].[0-9].[0-9]' \ diff --git a/docs/source/api/v3/about.rst b/docs/source/api/v3/about.rst index ff9a7c3c97..39fa050c08 100644 --- a/docs/source/api/v3/about.rst +++ b/docs/source/api/v3/about.rst @@ -45,7 +45,7 @@ No parameters available. Response Structure ------------------ :commitHash: The `Git `_ commit hash that Traffic Ops was built at. -:commits: The number of commits in the branch of the commit that Traffic Ops was built at, including that commit. Calculated by extracting the commit count from running ``git describe --tags``. +:commits: The number of commits in the branch of the commit that Traffic Ops was built at, including that commit. Calculated by extracting the commit count from running ``git describe --tags --long``. :goVersion: The version of `Go `_ that was used to build Traffic Ops. :release: The major version of CentOS or Red Hat Enterprise Linux that the build environment was running. :name: The human-readable name of the `RPM `_ file. diff --git a/docs/source/api/v4/about.rst b/docs/source/api/v4/about.rst index 74321ffec9..78b7e38258 100644 --- a/docs/source/api/v4/about.rst +++ b/docs/source/api/v4/about.rst @@ -46,7 +46,7 @@ No parameters available. Response Structure ------------------ :commitHash: The `Git `_ commit hash that Traffic Ops was built at. -:commits: The number of commits in the branch of the commit that Traffic Ops was built at, including that commit. Calculated by extracting the commit count from running ``git describe --tags``. +:commits: The number of commits in the branch of the commit that Traffic Ops was built at, including that commit. Calculated by extracting the commit count from running ``git describe --tags --long``. :goVersion: The version of `Go `_ that was used to build Traffic Ops. :release: The major version of CentOS or Red Hat Enterprise Linux that the build environment was running. :name: The human-readable name of the `RPM `_ file. diff --git a/docs/source/api/v5/about.rst b/docs/source/api/v5/about.rst index 8411a6707a..62af25b199 100644 --- a/docs/source/api/v5/about.rst +++ b/docs/source/api/v5/about.rst @@ -46,7 +46,7 @@ No parameters available. Response Structure ------------------ :commitHash: The `Git `_ commit hash that Traffic Ops was built at. -:commits: The number of commits in the branch of the commit that Traffic Ops was built at, including that commit. Calculated by extracting the commit count from running ``git describe --tags``. +:commits: The number of commits in the branch of the commit that Traffic Ops was built at, including that commit. Calculated by extracting the commit count from running ``git describe --tags --long``. :goVersion: The version of `Go `_ that was used to build Traffic Ops. :release: The major version of CentOS or Red Hat Enterprise Linux that the build environment was running. :name: The human-readable name of the `RPM `_ file. diff --git a/experimental/traffic-portal/server.config.ts b/experimental/traffic-portal/server.config.ts index 7df8a30543..9a172debbf 100644 --- a/experimental/traffic-portal/server.config.ts +++ b/experimental/traffic-portal/server.config.ts @@ -340,7 +340,7 @@ export async function getVersion(path?: string): Promise { }; try { - ver.commits = String(execSync("git describe --tags --match=RELEASE-[0-9].[0-9].[0-9] --match=RELEASE-[0-9][0-9].[0-9][0-9].[0-9][0-9] --match=v[0-9].[0-9].[0-9] --match=v[0-9][0-9].[0-9][0-9].[0-9][0-9]", {encoding: "utf8"}).split("-").slice(-2)[0]); + ver.commits = String(execSync("git describe --long --tags --match=RELEASE-[0-9].[0-9].[0-9] --match=RELEASE-[0-9][0-9].[0-9][0-9].[0-9][0-9] --match=v[0-9].[0-9].[0-9] --match=v[0-9][0-9].[0-9][0-9].[0-9][0-9]", {encoding: "utf8"}).split("-").slice(-2)[0]); ver.hash = execSync("git rev-parse --short=8 HEAD", {encoding: "utf8"}).trimEnd(); } catch (e) { console.warn("getting git parts of version:", e); diff --git a/infrastructure/cdn-in-a-box/Makefile b/infrastructure/cdn-in-a-box/Makefile index ade37fd799..35b1512e47 100644 --- a/infrastructure/cdn-in-a-box/Makefile +++ b/infrastructure/cdn-in-a-box/Makefile @@ -40,7 +40,7 @@ TC_DIR := $(CIAB_DIR_RELATIVE)../.. PKG_COMMAND := $(TC_DIR)/pkg PKG_FLAGS := -v -$(RHEL_VERSION) BUILD_SUFFIX := _build -BUILD_NUMBER := $(shell set -o pipefail; git describe --tags --match='RELEASE-[0-9].[0-9].[0-9]' --match='RELEASE-[0-9][0-9].[0-9][0-9].[0-9][0-9]' --match='v[0-9].[0-9].[0-9]' --match='v[0-9][0-9].[0-9][0-9].[0-9][0-9]' | awk -F- '{print $$(NF-1)}' || echo 0).$(shell git rev-parse --short=8 HEAD) +BUILD_NUMBER := $(shell set -o pipefail; git describe --long --tags --match='RELEASE-[0-9].[0-9].[0-9]' --match='RELEASE-[0-9][0-9].[0-9][0-9].[0-9][0-9]' --match='v[0-9].[0-9].[0-9]' --match='v[0-9][0-9].[0-9][0-9].[0-9][0-9]' | awk -F- '{print $$(NF-1)}' || echo 0).$(shell git rev-parse --short=8 HEAD) BUILD_ARCH := $(shell docker run --name=ciab-get-$(BASE_IMAGE)-$(RHEL_VERSION)-arch --rm $(BASE_IMAGE):$(RHEL_VERSION) rpm --eval %_arch ) TC_VERSION := $(shell cat "$(TC_DIR)/VERSION") TOMCAT_VERSION := $(shell grep '^\s*TOMCAT_VERSION=' "$(TC_DIR)/traffic_router/build/build_rpm.sh" | cut -d= -f2)