Merge CoreCLR-based official builds legs into one leg per platform

eng/pipelines/common/global-build-job.yml

@@ -237,10 +237,11 @@ jobs:
         - task: CodeQL3000Init@0
           displayName: Initialize CodeQL (manually-injected)
 
-      - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci $(_archParameter) $(_osParameter) $(crossArg) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_buildDarwinFrameworksParameter) $(_overrideTestScriptWindowsCmdParameter)
-        displayName: Build product
-        ${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}:
-          continueOnError: ${{ parameters.shouldContinueOnError }}
+      - template: /eng/pipelines/common/templates/global-build-step.yml
+        parameters:
+          buildArgs: ${{ parameters.buildArgs }}
+          useContinueOnErrorDuringBuild: $${{ parameters.useContinueOnErrorDuringBuild }}
+          shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
 
       - ${{ if eq(parameters.isManualCodeQLBuild, true) }}:
         - task: CodeQL3000Finalize@0

eng/pipelines/common/templates/global-build-step.yml

@@ -0,0 +1,11 @@
+parameters:
+  buildArgs: ''
+  useContinueOnErrorDuringBuild: false
+  shouldContinueOnError: false
+  archParameter: $(_archParameter)
+
+steps:
+  - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci ${{ parameters.archParameter }} $(_osParameter) $(crossArg) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_buildDarwinFrameworksParameter) $(_overrideTestScriptWindowsCmdParameter)
+    displayName: Build product
+    ${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}:
+      continueOnError: ${{ parameters.shouldContinueOnError }}

eng/pipelines/common/templates/runtimes/xplat-job.yml

@@ -77,15 +77,6 @@ jobs:
     - name: buildConfig
       value: ${{ parameters.buildConfig }}
 
-    - name: archType
-      value: ${{ parameters.archType }}
-
-    - name: osGroup
-      value: ${{ parameters.osGroup }}
-
-    - name: osSubgroup
-      value: ${{ parameters.osSubgroup }}
-
     - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}:
       - name: _HelixSource
         value: official/dotnet/runtime/$(Build.SourceBranch)

eng/pipelines/common/xplat-setup.yml

@@ -45,6 +45,15 @@ jobs:
 
       - name: _BuildConfig
         value: $(buildConfigUpper)
+
+      - name: archType
+        value: ${{ parameters.archType }}
+
+      - name: osGroup
+        value: ${{ parameters.osGroup }}
+
+      - name: osSubgroup
+        value: ${{ parameters.osSubgroup }}
 
       - name: _runSmokeTestsOnlyArg
         value: '/p:RunSmokeTestsOnly=$(isRunSmokeTestsOnly)'

eng/pipelines/coreclr/templates/build-job.yml

@@ -229,7 +229,7 @@ jobs:
           artifactName: $(buildProductArtifactName)
           displayName: 'product build'
 
-    - ${{ if and(in(parameters.osGroup, 'windows', 'linux'), ne(parameters.archType, 'x86')) }}:
+    - ${{ if and(in(parameters.osGroup, 'windows'), ne(parameters.archType, 'x86')) }}:
         - template: /eng/pipelines/coreclr/templates/crossdac-build.yml
           parameters:
             archType: ${{ parameters.archType }}

eng/pipelines/coreclr/templates/crossdac-build.yml

@@ -13,68 +13,3 @@ steps:
 
     - script: $(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) ${{ parameters.archType }} -hostarch ${{ parameters.hostArchType }} -ci -os alpine -cmakeargs "-DCLR_CROSS_COMPONENTS_BUILD=1" -ninja $(officialBuildIdArg) -component crosscomponents
       displayName: Build Cross OS Linux-musl DAC for Windows
-
-    - powershell: |
-        function CopyAndVerifyCrossOsAssets {
-          [CmdletBinding()]
-          param (
-            [Parameter(Mandatory)][string]$crossDacDir,
-            [Parameter(Mandatory)][string]$targetDir
-          )
-
-          $crossDacDir = Join-Path $crossDacDir -ChildPath '${{ parameters.hostArchType }}'
-
-          $availableFiles = ls -File $crossDacDir
-
-          Write-Host "Probed for files in ""$crossDacDir"", found:"
-          $availableFiles | fl
-
-          if (-not ("mscordaccore.dll" -in $availableFiles.Name `
-                   -and "mscordaccore.pdb" -in $availableFiles.Name `
-                   -and "mscordbi.dll" -in $availableFiles.Name `
-                   -and "mscordbi.pdb" -in $availableFiles.Name`
-                   ))
-          {
-            Write-Error "Couldn't find one of the expected crossdac files."
-          }
-
-          New-Item $targetDir -ItemType 'Directory' -Force -ea 0
-          $availableFiles | %{ cp $_.FullName $targetDir -v }
-        }
-
-        $buildMuslDacRootFolderPath = "$(Build.SourcesDirectory)/artifacts/bin/coreclr/alpine.${{ parameters.archType }}.$(buildConfigUpper)"
-        $buildMuslStagingPath = "$(crossDacArtifactPath)/Linux_musl.${{ parameters.archType }}.$(buildConfigUpper)/${{ parameters.hostArchType }}"
-
-        $buildLinuxDacRootFolderPath = "$(Build.SourcesDirectory)/artifacts/bin/coreclr/Linux.${{ parameters.archType }}.$(buildConfigUpper)"
-        $buildLinuxDacStagingPath = "$(crossDacArtifactPath)/Linux.${{ parameters.archType }}.$(buildConfigUpper)/${{ parameters.hostArchType }}"
-
-
-        CopyAndVerifyCrossOsAssets -CrossDacDir $buildMuslDacRootFolderPath -TargetDir $buildMuslStagingPath
-        CopyAndVerifyCrossOsAssets -CrossDacDir $buildLinuxDacRootFolderPath -TargetDir $buildLinuxDacStagingPath
-
-        Write-Host "Final directory contents:"
-        ls -R $(crossDacArtifactPath)
-
-      displayName: Gather CrossDac Artifacts
-
-    - template: /eng/pipelines/coreclr/templates/sign-diagnostic-files.yml
-      parameters:
-        basePath: $(crossDacArtifactPath)
-        isOfficialBuild: ${{ parameters.isOfficialBuild }}
-        timeoutInMinutes: 30
-
-  - ${{ if eq(parameters.osGroup, 'linux') }}:
-    - task: CopyFiles@2
-      displayName: Gather runtime for CrossDac
-      inputs:
-        SourceFolder: $(coreClrProductRootFolderPath)
-        Contents: libcoreclr.so
-        TargetFolder: '$(crossDacArtifactPath)/${{ parameters.osGroup }}${{ parameters.osSubgroup }}.$(archType).$(buildConfigUpper)/${{ parameters.hostArchType }}'
-
-  # Make the assets available in a single container for the packaging job.
-  - task: PublishBuildArtifacts@1
-    displayName: Publish runtime for CrossDac
-    inputs:
-      pathtoPublish:  $(crossDacArtifactPath)
-      PublishLocation: Container
-      artifactName:  $(buildCrossDacArtifactName)

eng/pipelines/coreclr/templates/crossdac-hostarch.yml

@@ -0,0 +1,9 @@
+parameters:
+  archType: ''
+
+variables:
+  - name: crossDacHostArch
+    value: x64
+  - ${{ if eq(parameters.archType, 'arm') }}:
+    - name: crossDacHostArch
+      value: x86

eng/pipelines/installer/jobs/steps/build-linux-package.yml

@@ -4,6 +4,7 @@ parameters:
   packageStepDescription: null
   packagingArgs: ''
   subsetArg: ''
+  condition: succeeded()
 
 steps:
 ## Run NuGet Authentication for each of the side containers
@@ -20,6 +21,7 @@ steps:
       /bl:artifacts/log/$(_BuildConfig)/msbuild.${{ parameters.packageType }}.installers.binlog
   displayName: Package ${{ parameters.packageStepDescription }} - ${{ parameters.packageType }}
   target: ${{ parameters.target }}
+  condition: ${{ parameters.condition }}
 # Broken symbolic links break the SBOM processing
 # We make some symlinks during the installer generation process,
 # but they aren't always valid on disk afterwards. Some of our tooling,