Installer build steps aren't cross builds

dotnet · Mar 21, 2024 · ab65443 · ab65443
1 parent 471f0eb
commit ab65443
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/eng/pipelines/common/templates/global-build-step.yml b/eng/pipelines/common/templates/global-build-step.yml
@@ -3,11 +3,12 @@ parameters:
   useContinueOnErrorDuringBuild: false
   shouldContinueOnError: false
   archParameter: $(_archParameter)
+  crossArg: $(crossArg)
   displayName: Build product
   container: ''
 
 steps:
-  - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci ${{ parameters.archParameter }} $(_osParameter) $(crossArg) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_buildDarwinFrameworksParameter) $(_overrideTestScriptWindowsCmdParameter)
+  - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci ${{ parameters.archParameter }} $(_osParameter) ${{ parameters.crossArg }} ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_buildDarwinFrameworksParameter) $(_overrideTestScriptWindowsCmdParameter)
     displayName: ${{ parameters.displayName }}
     ${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}:
       continueOnError: ${{ parameters.shouldContinueOnError }}

diff --git a/eng/pipelines/installer/steps/build-linux-package.yml b/eng/pipelines/installer/steps/build-linux-package.yml
@@ -16,6 +16,8 @@ steps:
     buildArgs: -s packs.installers ${{ parameters.packagingArgs }} /bl:artifacts/log/$(_BuildConfig)/msbuild.${{ parameters.packageType }}.installers.binlog
     container: ${{ parameters.target }}
     displayName: Package Runtime Deps, Runtime, Framework Packs - ${{ parameters.packageType }} packages
+    # Even for cross-build targets, our installer build steps are not cross-builds
+    crossArg: ''
     condition: ${{ parameters.condition }}
 
 # Broken symbolic links break the SBOM processing

diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
@@ -119,6 +119,7 @@ extends:
                   packageType: rpm
                   target: rpmpkg
                   packagingArgs: -c $(_BuildConfig) /p:BuildRpmPackage=true
+                  condition: and(succeeded(), eq(variables.osSubgroup, ''))
             condition: >-
               or(
                 eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true),