Skip to content

Commit 1c19033

Browse files
Fix building x86 Windows native AOT runtime packs (#100512)
Looks like we had a whole extra job definition just to avoid building the native AOT parts in the official build.
1 parent 862c82f commit 1c19033

File tree

1 file changed

+1
-35
lines changed

1 file changed

+1
-35
lines changed

eng/pipelines/runtime-official.yml

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ extends:
6565
buildConfig: release
6666
platforms:
6767
- windows_x64
68+
- windows_x86
6869
- windows_arm64
6970
jobParameters:
7071
templatePath: 'templates-official'
@@ -89,41 +90,6 @@ extends:
8990
parameters:
9091
name: $(osGroup)$(osSubgroup)_$(archType)
9192

92-
93-
#
94-
# Build CoreCLR runtime packs
95-
# Windows x86
96-
# No NativeAOT as NativeAOT is not supported on x86
97-
# Sign diagnostic files after native build
98-
#
99-
- template: /eng/pipelines/common/platform-matrix.yml
100-
parameters:
101-
jobTemplate: /eng/pipelines/common/global-build-job.yml
102-
buildConfig: release
103-
platforms:
104-
- windows_x86
105-
jobParameters:
106-
templatePath: 'templates-official'
107-
buildArgs: -s clr.runtime+clr.alljits -c $(_BuildConfig) /bl:$(Build.SourcesDirectory)/artifacts/logs/$(_BuildConfig)/CoreClrNativeBuild.binlog
108-
nameSuffix: CoreCLR
109-
isOfficialBuild: ${{ variables.isOfficialBuild }}
110-
timeoutInMinutes: 120
111-
postBuildSteps:
112-
- template: /eng/pipelines/coreclr/templates/sign-diagnostic-files.yml
113-
parameters:
114-
basePath: $(Build.SourcesDirectory)/artifacts/bin/coreclr
115-
isOfficialBuild: ${{ variables.isOfficialBuild }}
116-
timeoutInMinutes: 30
117-
# Now that we've signed the diagnostic files, do the rest of the build.
118-
- template: /eng/pipelines/common/templates/global-build-step.yml
119-
parameters:
120-
buildArgs: -s clr.corelib+clr.nativecorelib+clr.tools+clr.packages+libs+host+packs -c $(_BuildConfig)
121-
displayName: Build managed CoreCLR components, all libraries, hosts, and packs
122-
123-
# Upload the results.
124-
- template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
125-
parameters:
126-
name: $(osGroup)$(osSubgroup)_$(archType)
12793
#
12894
# Build CoreCLR runtime packs
12995
# Mac x64/arm64

0 commit comments

Comments
 (0)