From 58af330fea3bd7b3422f2146a217f81eb71652ca Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Wed, 23 Oct 2024 22:24:43 -0700 Subject: [PATCH 1/2] Ensure we only capture the BuildNumber when setting OriginalBuildNumber. The PR Val pipeline sets BuildNumber to provide additional details about the PR. This breaks upon rerun because the step which captures the OriginalBuildNumber isn't expecting the extra detail. This PR splits off the extra details when setting OriginalBuildNumber. --- azure-pipelines-pr-validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines-pr-validation.yml b/azure-pipelines-pr-validation.yml index 97361975bf064..35fa4494bc8d3 100644 --- a/azure-pipelines-pr-validation.yml +++ b/azure-pipelines-pr-validation.yml @@ -143,7 +143,7 @@ extends: ArtifactName: AssetManifests steps: - - powershell: Write-Host "##vso[task.setvariable variable=OriginalBuildNumber;isreadonly=true]$('$(Build.BuildNumber)')" + - powershell: Write-Host "##vso[task.setvariable variable=OriginalBuildNumber;isreadonly=true]$('$(Build.BuildNumber)'.Split(' - ')[0])" displayName: Setting OriginalBuildNumber variable condition: succeeded() From d6a1c9d1301cc4faad0dcf5bedb7344a4f32ab4a Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Wed, 23 Oct 2024 23:29:56 -0700 Subject: [PATCH 2/2] Fixup --- azure-pipelines-pr-validation.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/azure-pipelines-pr-validation.yml b/azure-pipelines-pr-validation.yml index 35fa4494bc8d3..8373362545bc1 100644 --- a/azure-pipelines-pr-validation.yml +++ b/azure-pipelines-pr-validation.yml @@ -143,9 +143,14 @@ extends: ArtifactName: AssetManifests steps: - - powershell: Write-Host "##vso[task.setvariable variable=OriginalBuildNumber;isreadonly=true]$('$(Build.BuildNumber)'.Split(' - ')[0])" + - task: Powershell@2 displayName: Setting OriginalBuildNumber variable condition: succeeded() + inputs: + targetType: inline + script: | + $originalBuildNumber = "$(Build.BuildNumber)".Split(' - ')[0] + Write-Host "##vso[task.setvariable variable=OriginalBuildNumber;isreadonly=true]$originalBuildNumber" - powershell: Write-Host "##vso[task.setvariable variable=SourceBranchName;isreadonly=true]$('$(Build.SourceBranch)'.Substring('refs/heads/'.Length))" displayName: Setting SourceBranchName variable