Skip to content

Commit 057e34d

Browse files
authored
Add additional steps in gcc validation leg (#61241)
1 parent 19a55ca commit 057e34d

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
# Compute job name from template parameters
4646
${{ if and(ne(parameters.testGroup, 'clrTools'), eq(parameters.compilerName, 'gcc')) }}:
4747
name: ${{ format('coreclr_{0}_product_build_{1}{1}_{3}_{4}', parameters.compilerName, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
48-
displayName: ${{ format('CoreCLR GCC Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
48+
displayName: ${{ format('GCC Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
4949
${{ if and(ne(parameters.testGroup, 'clrTools'), ne(parameters.compilerName, 'gcc')) }}:
5050
name: ${{ format('coreclr_{0}_product_build_{1}{2}_{3}_{4}{5}',
5151
parameters.runtimeVariant,
@@ -228,6 +228,11 @@ jobs:
228228
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) skipmanaged skipgeneratelayout $(buildConfig) $(archType) $(crossArg) $(osArg) $(priorityArg) $(compilerArg)
229229
displayName: Build native test components
230230

231+
# Build libs.native, host.native and mono with gcc
232+
- ${{ if eq(parameters.compilerName, 'gcc') }}:
233+
- script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) libs.native+host.native+mono $(compilerArg) $(crossArg) -arch $(archType) $(osArg) -c $(buildConfig) $(pgoInstrumentArg) $(officialBuildIdArg) -ci
234+
displayName: Build clr+mono+libs.native+host.native
235+
231236
# Sign and add entitlements to these MacOS binaries
232237
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
233238
- ${{ if eq(parameters.osGroup, 'OSX') }}:

eng/pipelines/runtime.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ jobs:
9494
eq(variables['isFullMatrix'], true))
9595
9696
#
97-
# Build CoreCLR checked using GCC toolchain
98-
# Only when CoreCLR is changed
97+
# Build the whole product using GNU compiler toolchain
98+
# When CoreCLR, Mono, Libraries, Installer and src/tests are changed
9999
#
100100
- template: /eng/pipelines/common/platform-matrix.yml
101101
parameters:
@@ -110,6 +110,9 @@ jobs:
110110
condition: >-
111111
or(
112112
eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
113+
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
114+
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
115+
eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
113116
eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
114117
eq(variables['isFullMatrix'], true))
115118
@@ -1275,4 +1278,4 @@ jobs:
12751278
or(
12761279
eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
12771280
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
1278-
eq(variables['isFullMatrix'], true))
1281+
eq(variables['isFullMatrix'], true))

0 commit comments

Comments
 (0)