From c9a135517fe9970bf1ea2917b86e132eda883f9c Mon Sep 17 00:00:00 2001
From: Santiago Fernandez Madero <safern@microsoft.com>
Date: Wed, 10 Feb 2021 16:52:17 -0800
Subject: [PATCH] Fix official build (#48139)

---
 eng/pipelines/runtime-official.yml | 50 +++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml
index 7d0efc6..9d9a792 100644
--- a/eng/pipelines/runtime-official.yml
+++ b/eng/pipelines/runtime-official.yml
@@ -304,34 +304,34 @@ stages:
       - windows_arm
       - windows_arm64
 
-- ${{ if eq(variables.isOfficialBuild, true) }}:
-  - template: /eng/pipelines/official/stages/publish.yml
+  #
+  # Build PGO CoreCLR release
+  #
+  - template: /eng/pipelines/common/platform-matrix.yml
     parameters:
-      isOfficialBuild: ${{ variables.isOfficialBuild }}
-
-#
-# Build PGO CoreCLR release
-#
-- template: /eng/pipelines/common/platform-matrix.yml
-  parameters:
-    jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml
-    buildConfig: release
-    platforms:
-    - windows_x64
-    jobParameters:
-      testGroup: innerloop
-      pgoType: 'PGO'
+      jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml
+      buildConfig: release
+      platforms:
+      - windows_x64
+      jobParameters:
+        testGroup: innerloop
+        pgoType: 'PGO'
 
   #
   # PGO Build
   #
-- template: /eng/pipelines/installer/installer-matrix.yml
-  parameters:
-    buildConfig: Release
-    jobParameters:
+  - template: /eng/pipelines/installer/installer-matrix.yml
+    parameters:
+      buildConfig: Release
+      jobParameters:
+        isOfficialBuild: ${{ variables.isOfficialBuild }}
+        liveRuntimeBuildConfig: release
+        liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
+        pgoType: 'PGO'
+      platforms:
+      - windows_x64
+
+- ${{ if eq(variables.isOfficialBuild, true) }}:
+  - template: /eng/pipelines/official/stages/publish.yml
+    parameters:
       isOfficialBuild: ${{ variables.isOfficialBuild }}
-      liveRuntimeBuildConfig: release
-      liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
-      pgoType: 'PGO'
-    platforms:
-    - windows_x64
-- 
2.7.4