Follow-up: Add enforce PGO to official builds (#13437)

* Add variables to pipeline to enable enforcepgo for Release

* Address review

diff --git a/build.cmd b/build.cmd
index b0a480a..80b0524 100644 (file)
--- a/build.cmd
+++ b/build.cmd
@@ -242,12 +242,10 @@ set __RunArgs=-BuildOS=%__BuildOS% -BuildType=%__BuildType% -BuildArch=%__BuildA
 
 if %__EnforcePgo%==1 (
     if %__BuildArchArm%==1 (
-        echo Error: enforcepgo cannot be used with arm architecture
-        goto Usage
+        echo NOTICE: enforcepgo does nothing on arm architecture
     )
     if %__BuildArchArm64%==1 (
-        echo Error: enforcepgo cannot be used with arm64 architecture
-        goto Usage
+        echo NOTICE: enforcepgo does nothing on arm64 architecture
     )
 )
 

diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json b/buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json
index 8ec9054..a4d6566 100644 (file)
--- a/buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json
+++ b/buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json
@@ -86,7 +86,7 @@
       },
       "inputs": {
         "filename": "build.cmd",
-        "arguments": "$(Architecture) $(PB_BuildType) skiptests skipbuildpackages -OfficialBuildId=$(OfficialBuildId) -skiprestore -Priority=$(Priority)",
+        "arguments": "$(Architecture) $(PB_BuildType) skiptests skipbuildpackages $(PB_EnforcePGO) -OfficialBuildId=$(OfficialBuildId) -skiprestore -Priority=$(Priority)",
         "workingFolder": "",
         "failOnStandardError": "false"
       }
@@ -294,6 +294,10 @@
     "VsoPassword": {
       "value": null,
       "isSecret": true
+    },
+    "PB_EnforcePGO": {
+      "value": "",
+      "allowOverride": true
     }
   },
   "retentionRules": [

diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Windows.json b/buildpipeline/DotNet-CoreClr-Trusted-Windows.json
index 6cf49de..a97132b 100644 (file)
--- a/buildpipeline/DotNet-CoreClr-Trusted-Windows.json
+++ b/buildpipeline/DotNet-CoreClr-Trusted-Windows.json
@@ -86,7 +86,7 @@
       },
       "inputs": {
         "filename": "build.cmd",
-        "arguments": "$(Architecture) $(PB_BuildType) skiptests skipbuildpackages toolset_dir C:\\tools\\clr -OfficialBuildId=$(OfficialBuildId) -Priority=$(Priority) -skiprestore -disableoss -- /flp:\"v=diag\"",
+        "arguments": "$(Architecture) $(PB_BuildType) skiptests skipbuildpackages $(PB_EnforcePGO) toolset_dir C:\\tools\\clr -OfficialBuildId=$(OfficialBuildId) -Priority=$(Priority) -skiprestore -disableoss -- /flp:\"v=diag\"",
         "workingFolder": "",
         "failOnStandardError": "false"
       }
@@ -284,6 +284,10 @@
     },
     "TeamName": {
       "value": "DotNetCore"
+    },
+    "PB_EnforcePGO": {
+      "value": "",
+      "allowOverride": true
     }
   },
   "retentionRules": [

diff --git a/buildpipeline/pipelines.json b/buildpipeline/pipelines.json
index 46b647e..fc1df6e 100644 (file)
--- a/buildpipeline/pipelines.json
+++ b/buildpipeline/pipelines.json
@@ -132,7 +132,8 @@
         "TreatWarningsAsErrors": "false"
       },
       "BuildParameters": {
-        "PB_BuildType": "Release"
+        "PB_BuildType": "Release",
+        "PB_EnforcePGO": "enforcepgo"
       },
       "ReportingParameters": {
         "PB_BuildType": "Release"