Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase the installer build jobs on the global build job template #100110

Merged
merged 11 commits into from
Apr 4, 2024
Merged
5 changes: 4 additions & 1 deletion eng/pipelines/common/templates/global-build-step.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@ parameters:
useContinueOnErrorDuringBuild: false
shouldContinueOnError: false
archParameter: $(_archParameter)
crossArg: $(crossArg)
displayName: Build product
container: ''
condition: succeeded()

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 }}
${{ if ne(parameters.container, '') }}:
target: ${{ parameters.container }}
condition: ${{ parameters.condition }}
248 changes: 0 additions & 248 deletions eng/pipelines/installer/jobs/build-job.yml

This file was deleted.

65 changes: 0 additions & 65 deletions eng/pipelines/installer/jobs/steps/upload-job-artifacts.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,23 @@ parameters:
target: ''
packageStepDescription: null
packagingArgs: ''
subsetArg: ''
condition: succeeded()

steps:
## Run NuGet Authentication for each of the side containers
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
- task: NuGetAuthenticate@1
target: ${{ parameters.target }}
- script: |
$(Build.SourcesDirectory)/build.sh \
--ci \
${{ parameters.subsetArg }} \
${{ parameters.packagingArgs }} \
$(CommonMSBuildArgs) \
$(librariesBuildConfigArg) \
$(runtimeBuildConfigArg) \
/bl:artifacts/log/$(_BuildConfig)/msbuild.${{ parameters.packageType }}.installers.binlog
displayName: Package ${{ parameters.packageStepDescription }} - ${{ parameters.packageType }}
target: ${{ parameters.target }}
condition: ${{ parameters.condition }}

- template: /eng/pipelines/common/templates/global-build-step.yml
parameters:
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
# We make some symlinks during the installer generation process,
# but they aren't always valid on disk afterwards. Some of our tooling,
Expand Down
26 changes: 26 additions & 0 deletions eng/pipelines/installer/steps/upload-job-artifacts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
parameters:
name: ''

steps:
# Upload binaries and symbols on failure to allow debugging issues
- task: CopyFiles@2
displayName: Prepare binaries to publish
inputs:
SourceFolder: '$(Build.SourcesDirectory)/artifacts/bin'
Contents: |
*/corehost/**
*/corehost_test/**
TargetFolder: '$(Build.StagingDirectory)/Binaries'
continueOnError: true
condition: failed()

- template: /eng/pipelines/common/upload-artifact-step.yml
parameters:
rootFolder: '$(Build.StagingDirectory)/Binaries'
includeRootFolder: false
archiveType: $(archiveType)
archiveExtension: $(archiveExtension)
tarCompression: $(tarCompression)
artifactName: 'Installer-Binaries-${{ parameters.name }}-$(_BuildConfig)'
displayName: 'Binaries'
condition: failed()
Loading
Loading