Change Move Official builder into a separate build variable

dotnet · Aug 9, 2022 · a43e07b · a43e07b
1 parent 3d0b0e6
commit a43e07b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -26,14 +26,17 @@ variables:
   - ${{ if eq(variables['System.TeamProject'], 'public') }}:
     - name: _InternalRuntimeDownloadArgs
       value: ''
+    - name: _OfficialBuildArgs
+      value: ''
   - ${{ if ne(variables['System.TeamProject'], 'public') }}:
     - name: _DotNetPublishToBlobFeed
       value: true
+    - name: _OfficialBuildArgs
+      value: /p:OfficialBuilder=Microsoft
     - group: DotNetBuilds storage account read tokens
     - name: _InternalRuntimeDownloadArgs
       value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal 
         /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) 
-        /p:OfficialBuilder=Microsoft
   - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
     - group: DotNet-CLI-SDLValidation-Params
 

diff --git a/eng/build.yml b/eng/build.yml
@@ -74,6 +74,7 @@ jobs:
                     $(_OfficialBuildIdArgs)
                     /p:Test=false
                     $(_InternalRuntimeDownloadArgs)
+                    $(_OfficialBuildArgs)
           displayName: Build
           env:
             BuildConfig: $(_BuildConfig)
@@ -480,4 +481,4 @@ jobs:
           ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)'	
           publishLocation: Container	
         continueOnError: true	
-        condition: always()
+        condition: always()