Merge pull request #8225 from dotnet/fix-build-config-loop

Update azure-pipelines.yml - fixup build config loops
dotnet · Jul 15, 2024 · ac1fb4f · ac1fb4f
2 parents 8ef613c + 8c276f3
commit ac1fb4f
Showing 1 changed file with 60 additions and 62 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -136,70 +136,68 @@ extends:
                 displayName: Windows Build / Publish
 
             - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
-              - ${{ each config in parameters.buildConfigurations }}:
-                - job: OSX_${{ config.buildConfig }}
-                  displayName: OSX ${{ config.buildConfig }}
-                  pool:
-                    vmImage: 'macOS-latest'
-                  variables:
-                  - _BuildConfig: ${{ config.buildConfig }}
-                  - _SignType: none
-                  steps:
-                  - ${{ if ne(variables['System.TeamProject'], 'public') }}:
-                    - task: Bash@3
-                      displayName: Setup Private Feeds Credentials
-                      inputs:
-                        filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
-                        arguments: $(Build.SourcesDirectory)/NuGet.config $Token
-                      env:
-                        Token: $(dn-bot-dnceng-artifact-feeds-rw)
-
-                  - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml
-
-                  - script: eng/common/cibuild.sh
-                      --configuration $(_BuildConfig)
-                      --prepareMachine
-                      --integrationTest
-                      $(_InternalRuntimeDownloadArgs)
-                    name: Build
-                    displayName: Build
+              - job: OSX_${{ config.buildConfig }}
+                displayName: OSX ${{ config.buildConfig }}
+                pool:
+                  vmImage: 'macOS-latest'
+                variables:
+                - _BuildConfig: ${{ config.buildConfig }}
+                - _SignType: none
+                steps:
+                - ${{ if ne(variables['System.TeamProject'], 'public') }}:
+                  - task: Bash@3
+                    displayName: Setup Private Feeds Credentials
+                    inputs:
+                      filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
+                      arguments: $(Build.SourcesDirectory)/NuGet.config $Token
+                    env:
+                      Token: $(dn-bot-dnceng-artifact-feeds-rw)
+
+                - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml
+
+                - script: eng/common/cibuild.sh
+                    --configuration $(_BuildConfig)
+                    --prepareMachine
+                    --integrationTest
+                    $(_InternalRuntimeDownloadArgs)
+                  name: Build
+                  displayName: Build
 
             - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
-              - ${{ each config in parameters.buildConfigurations }}:
-                - job: Linux_${{ config.buildConfig }}
-                  displayName: Linux ${{ config.buildConfig }}
-                  pool:
-                    ${{ if eq(variables['System.TeamProject'], 'public') }}:
-                      name: $(DncEngPublicBuildPool)
-                      image: 1es-ubuntu-2204-open
-                      os: linux
-                    ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-                      name: $(DncEngInternalBuildPool)
-                      image: 1es-ubuntu-2204
-                      os: linux
-                  variables:
-                  - _BuildConfig: ${{ config.buildConfig }}
-                  - _SignType: none
-                  steps:
-                  - ${{ if ne(variables['System.TeamProject'], 'public') }}:
-                    - task: Bash@3
-                      displayName: Setup Private Feeds Credentials
-                      inputs:
-                        filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
-                        arguments: $(Build.SourcesDirectory)/NuGet.config $Token
-                      env:
-                        Token: $(dn-bot-dnceng-artifact-feeds-rw)
-
-                  - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml
-
-                  - script: eng/common/cibuild.sh
-                      --configuration $(_BuildConfig)
-                      --prepareMachine
-                      --integrationTest
-                      $(_InternalRuntimeDownloadArgs)
-                    name: Build
-                    displayName: Build
-                    condition: succeeded()
+              - job: Linux_${{ config.buildConfig }}
+                displayName: Linux ${{ config.buildConfig }}
+                pool:
+                  ${{ if eq(variables['System.TeamProject'], 'public') }}:
+                    name: $(DncEngPublicBuildPool)
+                    image: 1es-ubuntu-2204-open
+                    os: linux
+                  ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+                    name: $(DncEngInternalBuildPool)
+                    image: 1es-ubuntu-2204
+                    os: linux
+                variables:
+                - _BuildConfig: ${{ config.buildConfig }}
+                - _SignType: none
+                steps:
+                - ${{ if ne(variables['System.TeamProject'], 'public') }}:
+                  - task: Bash@3
+                    displayName: Setup Private Feeds Credentials
+                    inputs:
+                      filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
+                      arguments: $(Build.SourcesDirectory)/NuGet.config $Token
+                    env:
+                      Token: $(dn-bot-dnceng-artifact-feeds-rw)
+
+                - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml
+
+                - script: eng/common/cibuild.sh
+                    --configuration $(_BuildConfig)
+                    --prepareMachine
+                    --integrationTest
+                    $(_InternalRuntimeDownloadArgs)
+                  name: Build
+                  displayName: Build
+                  condition: succeeded()
 
     - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
       - template: eng/common/templates-official/post-build/post-build.yml@self