Skip to content

Commit

Permalink
Fix building x86 Windows native AOT runtime packs (#100512)
Browse files Browse the repository at this point in the history
Looks like we had a whole extra job definition just to avoid building the native AOT parts in the official build.
  • Loading branch information
MichalStrehovsky committed Apr 3, 2024
1 parent 862c82f commit 1c19033
Showing 1 changed file with 1 addition and 35 deletions.
36 changes: 1 addition & 35 deletions eng/pipelines/runtime-official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ extends:
buildConfig: release
platforms:
- windows_x64
- windows_x86
- windows_arm64
jobParameters:
templatePath: 'templates-official'
Expand All @@ -89,41 +90,6 @@ extends:
parameters:
name: $(osGroup)$(osSubgroup)_$(archType)


#
# Build CoreCLR runtime packs
# Windows x86
# No NativeAOT as NativeAOT is not supported on x86
# Sign diagnostic files after native build
#
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/common/global-build-job.yml
buildConfig: release
platforms:
- windows_x86
jobParameters:
templatePath: 'templates-official'
buildArgs: -s clr.runtime+clr.alljits -c $(_BuildConfig) /bl:$(Build.SourcesDirectory)/artifacts/logs/$(_BuildConfig)/CoreClrNativeBuild.binlog
nameSuffix: CoreCLR
isOfficialBuild: ${{ variables.isOfficialBuild }}
timeoutInMinutes: 120
postBuildSteps:
- template: /eng/pipelines/coreclr/templates/sign-diagnostic-files.yml
parameters:
basePath: $(Build.SourcesDirectory)/artifacts/bin/coreclr
isOfficialBuild: ${{ variables.isOfficialBuild }}
timeoutInMinutes: 30
# Now that we've signed the diagnostic files, do the rest of the build.
- template: /eng/pipelines/common/templates/global-build-step.yml
parameters:
buildArgs: -s clr.corelib+clr.nativecorelib+clr.tools+clr.packages+libs+host+packs -c $(_BuildConfig)
displayName: Build managed CoreCLR components, all libraries, hosts, and packs

# Upload the results.
- template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
parameters:
name: $(osGroup)$(osSubgroup)_$(archType)
#
# Build CoreCLR runtime packs
# Mac x64/arm64
Expand Down

0 comments on commit 1c19033

Please sign in to comment.