Skip to content

Commit 70b773d

Browse files
committed
fix(version): populate FullCommit ldflag in build stamping paths
1 parent ac130e5 commit 70b773d

2 files changed

Lines changed: 3 additions & 0 deletions

File tree

pkg/version/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ go_library(
1212
# Full stamping (--stamp) is intentionally avoid systematic cache invalidation
1313
x_defs = {
1414
"github.com/DataDog/datadog-agent/pkg/version.Commit": "dev",
15+
"github.com/DataDog/datadog-agent/pkg/version.FullCommit": "dev",
1516
"github.com/DataDog/datadog-agent/pkg/version.AgentVersion": "0.0.0-dev",
1617
"github.com/DataDog/datadog-agent/pkg/version.AgentVersionURLSafe": "0.0.0-dev",
1718
"github.com/DataDog/datadog-agent/pkg/version.AgentPackageVersion": "0.0.0-dev",

tasks/libs/common/utils.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,11 +390,13 @@ def get_version_ldflags(ctx, install_path=None):
390390

391391
payload_v = get_payload_version()
392392
commit = get_commit_sha(ctx, short=True)
393+
full_commit = get_commit_sha(ctx, short=False)
393394
version = get_version(ctx, include_git=True)
394395
version_url_safe = get_version(ctx, include_git=True, url_safe=True, include_pipeline_id=True)
395396
package_version = os.getenv('PACKAGE_VERSION', version)
396397

397398
ldflags = f"-X {REPO_PATH}/pkg/version.Commit={commit} "
399+
ldflags += f"-X {REPO_PATH}/pkg/version.FullCommit={full_commit} "
398400
ldflags += f"-X {REPO_PATH}/pkg/version.AgentVersion={version} "
399401
ldflags += f"-X {REPO_PATH}/pkg/version.AgentPayloadVersion={payload_v} "
400402
if install_path:

0 commit comments

Comments
 (0)