Skip to content

Commit ab65443

Browse files
committed
Installer build steps aren't cross builds
1 parent 471f0eb commit ab65443

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ parameters:
33
useContinueOnErrorDuringBuild: false
44
shouldContinueOnError: false
55
archParameter: $(_archParameter)
6+
crossArg: $(crossArg)
67
displayName: Build product
78
container: ''
89

910
steps:
10-
- script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci ${{ parameters.archParameter }} $(_osParameter) $(crossArg) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_buildDarwinFrameworksParameter) $(_overrideTestScriptWindowsCmdParameter)
11+
- script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci ${{ parameters.archParameter }} $(_osParameter) ${{ parameters.crossArg }} ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_buildDarwinFrameworksParameter) $(_overrideTestScriptWindowsCmdParameter)
1112
displayName: ${{ parameters.displayName }}
1213
${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}:
1314
continueOnError: ${{ parameters.shouldContinueOnError }}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ steps:
1616
buildArgs: -s packs.installers ${{ parameters.packagingArgs }} /bl:artifacts/log/$(_BuildConfig)/msbuild.${{ parameters.packageType }}.installers.binlog
1717
container: ${{ parameters.target }}
1818
displayName: Package Runtime Deps, Runtime, Framework Packs - ${{ parameters.packageType }} packages
19+
# Even for cross-build targets, our installer build steps are not cross-builds
20+
crossArg: ''
1921
condition: ${{ parameters.condition }}
2022

2123
# Broken symbolic links break the SBOM processing

eng/pipelines/runtime.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ extends:
119119
packageType: rpm
120120
target: rpmpkg
121121
packagingArgs: -c $(_BuildConfig) /p:BuildRpmPackage=true
122+
condition: and(succeeded(), eq(variables.osSubgroup, ''))
122123
condition: >-
123124
or(
124125
eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true),

0 commit comments

Comments
 (0)