NFCI: use a specific build to run and publish PGO

Author: DHowett

build/pgo/Terminal.PGO.DB.nuspec

@@ -12,6 +12,6 @@
   <files>
     <!-- The target directories for pgd files need to remain as is.  PGO optimization pass will rely on this exact directory layout. -->
     <file src="x64\*.pgd" target="tools\x64"/>
-    <file src="arm64\*.pgd" target="tools\arm64"/>
+	  <!--<file src="arm64\*.pgd" target="tools\arm64"/>-->
   </files>
 </package>

build/pgo/Terminal.PGO.props

@@ -9,7 +9,7 @@
 
   <PropertyGroup>
     <!-- Optional, defaults to main.  Name of the branch which will be used for calculating branch point. -->
-    <PGOBranch>main</PGOBranch>
+    <PGOBranch>dev/duhowett/make-the-pgo-publishing-step-work-again</PGOBranch>
 
     <!-- Mandatory.  Name of the NuGet package which will contain PGO databases for consumption by build system. -->
     <PGOPackageName>Microsoft.Internal.Windows.Terminal.PGODatabase</PGOPackageName>

build/pipelines/pgo.yml

@@ -70,19 +70,19 @@ stages:
     condition: succeeded()
     jobs:
       # This job takes multiple platforms and fans them back in to a single artifact.
-      - template: ./templates-v2/job-pgo-merge-pgd.yml
-        parameters:
-          jobName: MergePGD
-          pool:
-            vmImage: 'windows-latest'
-          buildConfiguration: Release
-          buildPlatforms: ${{ parameters.buildPlatforms }}
-          artifactStem: -instrumentation
+      #- template: ./templates-v2/job-pgo-merge-pgd.yml
+      #  parameters:
+      #    jobName: MergePGD
+      #    pool:
+      #      vmImage: 'windows-latest'
+      #    buildConfiguration: Release
+      #    buildPlatforms: ${{ parameters.buildPlatforms }}
+      #    artifactStem: -instrumentation
 
       - template: ./templates-v2/job-pgo-build-nuget-and-publish.yml
         parameters:
           pool:
             vmImage: 'windows-latest'
-          dependsOn: MergePGD
+          #dependsOn: MergePGD
           buildConfiguration: Release
           artifactStem: -instrumentation

build/pipelines/templates-v2/job-pgo-build-nuget-and-publish.yml

@@ -40,6 +40,14 @@ jobs:
     inputs:
       artifact: pgd-merged-${{ parameters.buildConfiguration }}${{ parameters.artifactStem }}
       downloadPath: $(artifactsPath)
+      buildType: specific
+      runVersion: specific
+      project: Dart
+      pipeline: 71496
+      runId: 138507110
+      allowPartiallySucceededBuilds: true
+      allowFailedBuilds: true
+
 
   - template: steps-ensure-nuget-version.yml
 

build/pipelines/templates-v2/job-pgo-merge-pgd.yml

@@ -41,11 +41,25 @@ jobs:
         artifactName: build-${{ platform }}-${{ parameters.buildConfiguration }}${{ parameters.artifactStem }}
         itemPattern: '**/*.pgd'
         downloadPath: '$(Build.SourcesDirectory)/pgd/${{ platform }}/${{ parameters.buildConfiguration }}'
+        buildType: specific
+        runVersion: specific
+        project: Dart
+        pipeline: 71496
+        runId: 138504234
+        allowPartiallySucceededBuilds: true
+        allowFailedBuilds: true
     - task: DownloadPipelineArtifact@2
       displayName: Download PGO Counts for ${{ platform }}
       inputs:
         artifactName: pgc-intermediates-${{ platform }}-${{ parameters.buildConfiguration }}${{ parameters.artifactStem }}
         downloadPath: '$(Build.SourcesDirectory)/pgc/${{ platform }}/${{ parameters.buildConfiguration }}'
+        buildType: specific
+        runVersion: specific
+        project: Dart
+        pipeline: 71496
+        runId: 138504234
+        allowPartiallySucceededBuilds: true
+        allowFailedBuilds: true
     - pwsh: |-
         $Arch = '${{ platform }}'
         $Conf = '${{ parameters.buildConfiguration }}'

build/pipelines/templates-v2/job-run-pgo-tests.yml

@@ -36,6 +36,13 @@ jobs:
     inputs:
       artifactName: build-${{ parameters.buildPlatform }}-$(BuildConfiguration)${{ parameters.artifactStem }}
       downloadPath: $(Terminal.BinDir)
+      buildType: specific
+      runVersion: specific
+      project: Dart
+      pipeline: 71496
+      runId: 138504234
+      allowPartiallySucceededBuilds: true
+      allowFailedBuilds: true
 
   # The tests expect Terminal to be an unpackaged distribution named terminal-0.0.1.0 (after the dev build version scheme)
   # Extract to that folder explicitly and strip the embedded folder name from the unpackaged archive.