From d8690d867c8c62c419cbc52f6ffc35075d1ccc6a Mon Sep 17 00:00:00 2001 From: Joey Perrott Date: Fri, 6 Aug 2021 07:57:26 -0700 Subject: [PATCH] fix(dev-infra): search since HEAD on the local branch for version tags when creating stamps (#43065) Using `HEAD~100` was errantly left in the snapshot stamping logic. PR Close #43065 --- dev-infra/ng-dev.js | 2 +- dev-infra/release/stamping/env-stamp.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-infra/ng-dev.js b/dev-infra/ng-dev.js index 72f96de2b6..5eeacbb1b2 100755 --- a/dev-infra/ng-dev.js +++ b/dev-infra/ng-dev.js @@ -7765,7 +7765,7 @@ function getSCMVersions(mode) { const git = GitClient.get(); if (mode === 'snapshot') { const localChanges = hasLocalChanges() ? '.with-local-changes' : ''; - const { stdout: rawVersion } = git.run(['describe', '--match', '*[0-9]*.[0-9]*.[0-9]*', '--abbrev=7', '--tags', 'HEAD~100']); + const { stdout: rawVersion } = git.run(['describe', '--match', '*[0-9]*.[0-9]*.[0-9]*', '--abbrev=7', '--tags', 'HEAD']); const { version } = new semver.SemVer(rawVersion); const { version: experimentalVersion } = createExperimentalSemver(version); return { diff --git a/dev-infra/release/stamping/env-stamp.ts b/dev-infra/release/stamping/env-stamp.ts index a708e0f1d3..3c9f9bd547 100644 --- a/dev-infra/release/stamping/env-stamp.ts +++ b/dev-infra/release/stamping/env-stamp.ts @@ -56,8 +56,8 @@ function getSCMVersions(mode: EnvStampMode): {version: string, experimentalVersi const git = GitClient.get(); if (mode === 'snapshot') { const localChanges = hasLocalChanges() ? '.with-local-changes' : ''; - const {stdout: rawVersion} = git.run( - ['describe', '--match', '*[0-9]*.[0-9]*.[0-9]*', '--abbrev=7', '--tags', 'HEAD~100']); + const {stdout: rawVersion} = + git.run(['describe', '--match', '*[0-9]*.[0-9]*.[0-9]*', '--abbrev=7', '--tags', 'HEAD']); const {version} = new SemVer(rawVersion); const {version: experimentalVersion} = createExperimentalSemver(version); return {