Skip to content

Commit 68438ed

Browse files
jkoritzinskyjkoritzinsky
authored
Revert "[release/6.0-staging] Merge #92901 (#102862)" (#103484)
This reverts commit f71677a.
1 parent 8395636 commit 68438ed

17 files changed

+334
-249
lines changed

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

+5-6
Original file line numberDiff line numberDiff line change
@@ -171,12 +171,11 @@ jobs:
171171
displayName: Install native dependencies
172172

173173
# Build
174-
- template: /eng/pipelines/common/templates/global-build-step.yml
175-
parameters:
176-
buildArgs: ${{ parameters.buildArgs }}
177-
useContinueOnErrorDuringBuild: ${{ parameters.useContinueOnErrorDuringBuild }}
178-
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
179-
archType: ${{ parameters.archType }}
174+
- ${{ if eq(parameters.buildingOnSourceBuildImage, false) }}:
175+
- script: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(_osParameter) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_crossBuildPropertyArg) $(_cxx11Parameter) $(_richCodeNavigationParam) $(_buildDarwinFrameworksParameter)
176+
displayName: Build product
177+
${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}:
178+
continueOnError: ${{ parameters.shouldContinueOnError }}
180179

181180
- ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'Android') }}:
182181
- script: |

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

-12
This file was deleted.

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

+9
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,15 @@ jobs:
7474
- name: buildConfig
7575
value: ${{ parameters.buildConfig }}
7676

77+
- name: archType
78+
value: ${{ parameters.archType }}
79+
80+
- name: osGroup
81+
value: ${{ parameters.osGroup }}
82+
83+
- name: osSubgroup
84+
value: ${{ parameters.osSubgroup }}
85+
7786
- ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}:
7887
- name: _HelixSource
7988
value: official/dotnet/runtime/$(Build.SourceBranch)

‎eng/pipelines/common/xplat-setup.yml

-9
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,6 @@ jobs:
4848
- name: _BuildConfig
4949
value: $(buildConfigUpper)
5050

51-
- name: archType
52-
value: ${{ parameters.archType }}
53-
54-
- name: osGroup
55-
value: ${{ parameters.osGroup }}
56-
57-
- name: osSubgroup
58-
value: ${{ parameters.osSubgroup }}
59-
6051
- ${{ if or(eq(parameters.osGroup, 'windows'), eq(parameters.hostedOs, 'windows')) }}:
6152
- name: archiveExtension
6253
value: '.zip'

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

+8
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,14 @@ jobs:
267267
artifactName: $(buildProductArtifactName)
268268
displayName: 'product build'
269269

270+
- ${{ if and(in(parameters.osGroup, 'windows', 'Linux'), ne(parameters.archType, 'x86'), ne(parameters.compilerName, 'gcc'), ne(parameters.testGroup, 'clrTools')) }}:
271+
- template: /eng/pipelines/coreclr/templates/crossdac-build.yml
272+
parameters:
273+
archType: ${{ parameters.archType }}
274+
osGroup: ${{ parameters.osGroup }}
275+
osSubgroup: ${{ parameters.osSubgroup }}
276+
isOfficialBuild: ${{ parameters.isOfficialBuild }}
277+
270278
- ${{ if and(ne(parameters.compilerName, 'gcc'), ne(parameters.testGroup, ''), ne(parameters.testGroup, 'clrTools')) }}:
271279
# Publish test native components for consumption by test execution.
272280
- ${{ if ne(parameters.isOfficialBuild, true) }}:

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

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
parameters:
2+
archType: ''
3+
osGroup: ''
4+
osSubgroup: ''
5+
isOfficialBuild: false
6+
7+
steps:
8+
# Always build the crossdac, that way we know in CI/PR if things break to build.
9+
- ${{ if and(eq(parameters.osGroup, 'windows'), notin(parameters.archType, 'x86')) }}:
10+
- script: set __TestIntermediateDir=int&&$(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -ci -linuxdac -ninja $(officialBuildIdArg)
11+
displayName: Build Cross OS Linux DAC for Windows
12+
13+
- script: set __TestIntermediateDir=int&&$(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -ci -alpinedac -ninja $(officialBuildIdArg)
14+
displayName: Build Cross OS Linux-musl DAC for Windows
15+
16+
- task: CopyFiles@2
17+
displayName: Gather CrossDac Artifacts (Linux)
18+
inputs:
19+
SourceFolder: $(buildLinuxDacRootFolderPath)
20+
Contents: |
21+
**/*
22+
!**/sharedFramework/**/*
23+
TargetFolder: $(buildLinuxDacStagingPath)
24+
25+
- task: CopyFiles@2
26+
displayName: Gather CrossDac Artifacts (Linux_musl)
27+
inputs:
28+
SourceFolder: $(buildMuslDacRootFolderPath)
29+
Contents: |
30+
**/*
31+
!**/sharedFramework/**/*
32+
TargetFolder: '$(buildMuslDacStagingPath)'
33+
34+
- template: /eng/pipelines/coreclr/templates/sign-diagnostic-files.yml
35+
parameters:
36+
basePath: $(crossDacArtifactPath)
37+
isOfficialBuild: ${{ parameters.isOfficialBuild }}
38+
timeoutInMinutes: 30
39+
40+
- ${{ if eq(parameters.osGroup, 'Linux') }}:
41+
- task: CopyFiles@2
42+
displayName: Gather runtime for CrossDac
43+
inputs:
44+
SourceFolder: $(coreClrProductRootFolderPath)
45+
Contents: libcoreclr.so
46+
TargetFolder: '$(crossDacArtifactPath)/${{ parameters.osGroup }}${{ parameters.osSubgroup }}.$(archType).$(buildConfigUpper)/$(crossDacHostArch)'
47+
48+
# Make the assets available in a single container for the packaging job.
49+
- task: PublishBuildArtifacts@1
50+
displayName: Publish runtime for CrossDac
51+
inputs:
52+
pathtoPublish: $(crossDacArtifactPath)
53+
PublishLocation: Container
54+
artifactName: $(buildCrossDacArtifactName)

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

-9
This file was deleted.

‎eng/pipelines/coreclr/templates/crossdac-pack.yml

+79
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
parameters:
2+
archType: ''
3+
buildConfig: ''
4+
container: ''
5+
crossDacPlatforms: {}
6+
dependOnEvaluatePaths: false
7+
isOfficialBuild: false
8+
osGroup: ''
9+
osSubgroup: ''
10+
platform: ''
11+
pool: ''
12+
runtimeVariant: ''
13+
stagedBuild: false
14+
testGroup: ''
15+
timeoutInMinutes: ''
16+
variables: {}
17+
18+
jobs:
19+
- template: xplat-pipeline-job.yml
20+
parameters:
21+
archType: ${{ parameters.archType }}
22+
buildConfig: ${{ parameters.buildConfig }}
23+
container: ${{ parameters.container }}
24+
condition: ${{ parameters.isOfficialBuild }}
25+
helixType: 'build/product/'
26+
osGroup: ${{ parameters.osGroup }}
27+
osSubgroup: ${{ parameters.osSubgroup }}
28+
pool: ${{ parameters.pool }}
29+
runtimeVariant: ${{ parameters.runtimeVariant }}
30+
stagedBuild: ${{ parameters.stagedBuild }}
31+
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
32+
dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }}
33+
34+
name: crossdacpack
35+
displayName: CrossDac Packaging
36+
37+
variables:
38+
- name: officialBuildIdArg
39+
value: ''
40+
- name: crossDacArgs
41+
value: ''
42+
- ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}:
43+
- name: officialBuildIdArg
44+
value: '/p:OfficialBuildId=$(Build.BuildNumber)'
45+
- name: crossDacArgs
46+
value: '/p:CrossDacArtifactsDir=$(crossDacArtifactPath)/$(buildCrossDacArtifactName)'
47+
- name: SignType
48+
value: $[ coalesce(variables.OfficialSignType, 'real') ]
49+
- ${{ parameters.variables }}
50+
51+
dependsOn:
52+
- ${{ if ne(parameters.crossDacPlatforms, '') }}:
53+
- ${{ each platform in parameters.crossDacPlatforms }}:
54+
- ${{ parameters.runtimeFlavor }}_${{ parameters.runtimeVariant }}_product_build_${{ platform }}_${{ parameters.buildConfig }}
55+
56+
steps:
57+
- task: DownloadBuildArtifacts@0
58+
displayName: Download CrossDac artifacts
59+
inputs:
60+
artifactName: $(buildCrossDacArtifactName)
61+
downloadPath: $(crossDacArtifactPath)
62+
checkDownloadedFiles: true
63+
64+
- script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -subset crossdacpack -arch $(archType) $(osArg) -c $(buildConfig) $(officialBuildIdArg) $(crossDacArgs) -ci
65+
displayName: Build crossdac packaging
66+
67+
# Save packages using the prepare-signed-artifacts format.
68+
- template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
69+
parameters:
70+
name: ${{ parameters.platform }}
71+
72+
# Upload to artifacts to be signed
73+
- task: PublishPipelineArtifact@1
74+
displayName: Publish Logs
75+
inputs:
76+
targetPath: $(Build.SourcesDirectory)/artifacts/log
77+
artifactName: 'CrossDacPackagingLogs'
78+
continueOnError: true
79+
condition: always()

‎eng/pipelines/coreclr/templates/xplat-pipeline-job.yml

+6
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,12 @@ jobs:
7171
- name: buildProductRootFolderPath
7272
value: '$(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).$(buildConfigUpper)'
7373

74+
- name: buildCrossDacArtifactName
75+
value: CoreCLRCrossDacArtifacts
76+
77+
- name: crossDacArtifactPath
78+
value: $(Build.SourcesDirectory)/artifacts/$(buildCrossDacArtifactName)
79+
7480
- name: buildMuslDacRootFolderPath
7581
value: '$(Build.SourcesDirectory)/artifacts/bin/coreclr/alpine.$(archType).$(buildConfigUpper)'
7682

‎eng/pipelines/global-build.yml

+4-6
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,9 @@ jobs:
128128
- template: /eng/pipelines/common/platform-matrix.yml
129129
parameters:
130130
jobTemplate: /eng/pipelines/common/global-build-job.yml
131-
buildConfig: Release
131+
buildConfig: release
132132
platforms:
133-
- SourceBuild_linux_x64
133+
- SourceBuild_Linux_x64
134134
jobParameters:
135-
nameSuffix: PortableSourceBuild
136-
timeoutInMinutes: 95
137-
condition:
138-
eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true)
135+
nameSuffix: SourceBuild
136+
timeoutInMinutes: 90

‎eng/pipelines/installer/installer-matrix.yml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
parameters:
2+
runtimeFlavor: 'coreclr'
3+
platforms: []
4+
jobParameters: []
5+
buildConfig: Release
6+
runtimeVariant: ''
7+
8+
jobs:
9+
10+
#
11+
# Build and Test
12+
#
13+
- template: /eng/pipelines/common/platform-matrix.yml
14+
parameters:
15+
jobTemplate: /eng/pipelines/installer/jobs/base-job.yml
16+
buildConfig: ${{ parameters.buildConfig }}
17+
platforms: ${{ parameters.platforms }}
18+
passPlatforms: true
19+
runtimeFlavor: ${{ parameters.runtimeFlavor }}
20+
runtimeVariant: ${{ parameters.runtimeVariant }}
21+
jobParameters:
22+
${{ insert }}: ${{ parameters.jobParameters }}

‎eng/pipelines/installer/jobs/base-job.yml

+26-3
Original file line numberDiff line numberDiff line change
@@ -397,9 +397,32 @@ jobs:
397397
env:
398398
Token: $(dn-bot-dnceng-artifact-feeds-rw)
399399

400-
- script: $(BaseJobBuildCommand)
401-
displayName: Build
402-
continueOnError: ${{ and(eq(variables.SkipTests, false), eq(parameters.shouldContinueOnError, true)) }}
400+
# Build the default subset non-MacOS platforms
401+
- ${{ if ne(parameters.osGroup, 'OSX') }}:
402+
- script: $(BaseJobBuildCommand)
403+
displayName: Build
404+
continueOnError: ${{ and(eq(variables.SkipTests, false), eq(parameters.shouldContinueOnError, true)) }}
405+
406+
# Build corehost, sign and add entitlements to MacOS binaries
407+
- ${{ if eq(parameters.osGroup, 'OSX') }}:
408+
- script: $(BaseJobBuildCommand) -subset host.native
409+
displayName: Build CoreHost
410+
continueOnError: ${{ and(eq(variables.SkipTests, false), eq(parameters.shouldContinueOnError, true)) }}
411+
412+
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
413+
- template: /eng/pipelines/common/macos-sign-with-entitlements.yml
414+
parameters:
415+
filesToSign:
416+
- name: dotnet
417+
path: $(Build.SourcesDirectory)/artifacts/bin/osx-${{ parameters.archType }}.$(_BuildConfig)/corehost
418+
entitlementsFile: $(Build.SourcesDirectory)/eng/pipelines/common/entitlements.plist
419+
- name: apphost
420+
path: $(Build.SourcesDirectory)/artifacts/bin/osx-${{ parameters.archType }}.$(_BuildConfig)/corehost
421+
entitlementsFile: $(Build.SourcesDirectory)/eng/pipelines/common/entitlements.plist
422+
423+
- script: $(BaseJobBuildCommand) -subset host.pkg+host.tools+host.tests+packs
424+
displayName: Build and Package
425+
continueOnError: ${{ and(eq(variables.SkipTests, false), eq(parameters.shouldContinueOnError, true)) }}
403426

404427
- ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}:
405428
- script: |

0 commit comments

Comments
 (0)