Refactoring

dotnet · Mar 22, 2024 · 6cc6b72 · 6cc6b72
1 parent b90a588
commit 6cc6b72
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml
@@ -275,7 +275,7 @@ jobs:
 
     - template: /eng/pipelines/common/templates/publish-build-artifacts.yml
       parameters:
-        isOfficial: ${{ parameters.isOfficialBuild }}
+        isOfficialBuild: ${{ parameters.isOfficialBuild }}
         displayName: Publish Logs
         inputs:
           PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/'

diff --git a/eng/pipelines/common/templates/pipeline-with-resources.yml b/eng/pipelines/common/templates/pipeline-with-resources.yml
@@ -7,9 +7,9 @@ parameters:
 extends:
   template: templateDispatch.yml
   parameters:
-    ${{ if eq(parameters.isOfficial, true) }}:
+    ${{ if parameters.isOfficialBuild }}:
       templatePath: template1es.yml
-    ${{ if eq(parameters.isOfficial, false) }}:
+    ${{ else }}:
       templatePath: templatePublic.yml
 
     stages: ${{ parameters.stages }}

diff --git a/eng/pipelines/common/templates/publish-build-artifacts.yml b/eng/pipelines/common/templates/publish-build-artifacts.yml
@@ -1,5 +1,5 @@
 parameters:
-  - name: isOfficial
+  - name: isOfficialBuild
     type: boolean
   - name: displayName
     type: string
@@ -10,7 +10,7 @@ parameters:
     default: ''
 
 steps:
-  - ${{ if eq(parameters.isOfficial, 'true') }}:
+  - ${{ if parameters.isOfficialBuild }}:
     - task: 1ES.PublishBuildArtifacts@1
       displayName: ${{ parameters.displayName }}
       inputs: ${{ parameters.inputs }}

diff --git a/eng/pipelines/common/templates/publish-pipeline-artifacts.yml b/eng/pipelines/common/templates/publish-pipeline-artifacts.yml
@@ -3,7 +3,7 @@ parameters:
   type: string
 - name: inputs
   type: object
-- name: isOfficial
+- name: isOfficialBuild
   type: boolean
 
 steps:

diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml
@@ -41,7 +41,7 @@ parameters:
 - name: crossBuild
   type: boolean
   default: false
-- name: isOfficial
+- name: isOfficialBuild
   type: boolean
 
 ### Build managed test components (native components are getting built as part
@@ -171,7 +171,7 @@ jobs:
     - template: /eng/pipelines/common/templates/publish-pipeline-artifacts.yml
       parameters:
         displayName: Publish Logs
-        isOfficial: ${{ parameters.isOfficial }}
+        isOfficialBuild: ${{ parameters.isOfficialBuild }}
         inputs:
           targetPath: $(Build.SourcesDirectory)/artifacts/log
           ArtifactName: '${{ parameters.runtimeFlavor }}_Common_Runtime_TestBuildLogs_Attempt$(System.JobAttempt)_AnyOS_AnyCPU_$(buildConfig)_${{ parameters.testGroup }}'

diff --git a/eng/pipelines/common/upload-artifact-step.yml b/eng/pipelines/common/upload-artifact-step.yml
@@ -1,5 +1,5 @@
 parameters:
-- name: isOfficialBuild
+- name: isOfficialBuildBuild
   type: boolean
 - name: rootFolder
   type: string
@@ -40,7 +40,7 @@ steps:
 
   - template: /eng/pipelines/common/templates/publish-build-artifacts.yml
     parameters:
-      isOfficial: ${{ parameters.isOfficialBuild }}
+      isOfficialBuild: ${{ parameters.isOfficialBuild }}
       displayName: 'Publish ${{ parameters.displayName }}'
       inputs:
         PathtoPublish: $(Build.StagingDirectory)/${{ parameters.artifactName }}${{ parameters.archiveExtension }}

diff --git a/eng/pipelines/common/upload-intermediate-artifacts-step.yml b/eng/pipelines/common/upload-intermediate-artifacts-step.yml
@@ -27,7 +27,7 @@ steps:
 
 - template: /eng/pipelines/common/templates/publish-build-artifacts.yml
   parameters:
-    isOfficial: true
+    isOfficialBuild: true
     displayName: Publish intermediate artifacts
     inputs:
       PathtoPublish: '$(Build.StagingDirectory)/IntermediateArtifacts'

diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml
@@ -13,7 +13,7 @@ variables:
 - name: Codeql.Enabled
   value: ${{ eq(variables['Build.DefinitionName'], 'dotnet-runtime-codeql') }}
 
-- name: isOfficialBuild
+- name: isOfficialBuildBuild
   value: ${{ and(eq(variables['System.TeamProject'], 'internal'), eq(variables['Build.DefinitionName'], 'dotnet-runtime-official')) }}
 - name: isRollingBuild
   value: ${{ ne(variables['Build.Reason'], 'PullRequest') }}

diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml
@@ -30,7 +30,7 @@ variables:
 extends:
   template:  /eng/pipelines/common/templates/pipeline-with-resources.yml
   parameters:
-    isOfficial: true
+    isOfficialBuild: true
     stages:
     - stage: Build
       jobs: