Skip to content

Commit 4bd20a8

Browse files
Fix the assembly stamping of the base build after moving to gha (#478)
1 parent a5d09f4 commit 4bd20a8

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

Build/Src/FwBuildTasks/Substitute.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,19 +77,19 @@ public override bool Execute()
7777
var numberOfDays = Convert.ToInt32(Math.Truncate(DateTime.Now.ToOADate())).ToString();
7878
fileContents = regex.Replace(fileContents, numberOfDays);
7979

80-
// Jenkins builds should set the BUILD_NUMBER in the environment
81-
var buildNumber = Environment.GetEnvironmentVariable("BUILD_NUMBER");
80+
// GHA builds set the RELEASE_BASE_BUILD_NUMBER in the environment
81+
var buildNumber = Environment.GetEnvironmentVariable("RELEASE_BASE_BUILD_NUMBER");
8282
if (string.IsNullOrEmpty(buildNumber))
8383
{
84-
// fall back to number of days if no BUILD_NUMBER is in the environment
84+
// fall back to number of days if no RELEASE_BASE_BUILD_NUMBER is in the environment
8585
buildNumber = numberOfDays;
8686
}
8787
regex = new Regex("\\$BUILDNUMBER");
8888
fileContents = regex.Replace(fileContents, buildNumber);
8989

90-
// If BaseBuildish is set, this is a patch build: use BaseBuildish;
91-
// otherwise, this is a base build: use BUILD_NUMBER
92-
var baseBuildNumber = Environment.GetEnvironmentVariable("BaseBuildish");
90+
// If BASE_BUILD_NUMBER is set, this is a patch build: use BASE_BUILD_NUMBER;
91+
// otherwise, this is a base build: use buildNumber
92+
var baseBuildNumber = Environment.GetEnvironmentVariable("BASE_BUILD_NUMBER");
9393
if (string.IsNullOrEmpty(baseBuildNumber))
9494
{
9595
baseBuildNumber = buildNumber;

0 commit comments

Comments
 (0)