Skip to content

Don't merge sample build artifacts #6851

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Apr 15, 2025
Merged

Don't merge sample build artifacts #6851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
637a68a
Try splitting the sample upload/download
andrewlock Apr 14, 2025
c7a4c87
Remove merge
andrewlock Apr 14, 2025
c0802f0
Extract a template for it
andrewlock Apr 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .azure-pipelines/steps/download-samples.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
parameters:
- name: 'framework'
type: 'string'
default: ''

steps:
- task: DownloadPipelineArtifact@2
displayName: Download standalone samples
inputs:
artifact: samples-standalone
path: $(outputDir)/bin
retryCountOnTaskFailure: 5

- ${{ if ne(parameters.framework, '') }}:
- task: DownloadPipelineArtifact@2
displayName: Download multi-version samples
inputs:
artifact: samples-multi-version-${{ parameters.framework }}
path: $(outputDir)/publish
retryCountOnTaskFailure: 5
143 changes: 19 additions & 124 deletions .azure-pipelines/ultimate-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1560,7 +1560,7 @@ stages:
jobs:
- template: steps/update-github-status-jobs.yml
parameters:
jobs: [standalone, multi_version, merge]
jobs: [standalone, multi_version]

- job: standalone
timeoutInMinutes: 60 #default value
Expand All @@ -1579,7 +1579,7 @@ stages:

- publish: $(outputDir)/bin
displayName: Upload artifact samples (bin only)
artifact: samples-bin-standalone
artifact: samples-standalone

- publish: artifacts/build_data
displayName: Uploading logs
Expand Down Expand Up @@ -1624,7 +1624,7 @@ stages:
retryCountOnTaskFailure: 1

- publish: $(outputDir)/publish
displayName: Upload artifact samples (bin only)
displayName: Upload artifact samples (publish only)
artifact: samples-multi-version-$(framework)

- publish: artifacts/build_data
Expand All @@ -1633,91 +1633,6 @@ stages:
condition: failed()
continueOnError: true

- job: merge
dependsOn: [ standalone, multi_version ]
timeoutInMinutes: 60 #default value
pool:
name: azure-windows-scale-set-3
steps:
- checkout: none
- powershell: |
mkdir $(Build.ArtifactStagingDirectory)/bin
mkdir $(Build.ArtifactStagingDirectory)/publish

- task: DownloadPipelineArtifact@2
displayName: Download samples
inputs:
artifact: samples-bin-standalone
path: $(Build.ArtifactStagingDirectory)/bin
retryCountOnTaskFailure: 5

- task: DownloadPipelineArtifact@2
displayName: Download samples
inputs:
artifact: samples-multi-version-net462
path: $(Build.ArtifactStagingDirectory)/publish
retryCountOnTaskFailure: 5

- task: DownloadPipelineArtifact@2
displayName: Download samples
inputs:
artifact: samples-multi-version-netcoreapp2.1
path: $(Build.ArtifactStagingDirectory)/publish
retryCountOnTaskFailure: 5

- task: DownloadPipelineArtifact@2
displayName: Download samples
inputs:
artifact: samples-multi-version-netcoreapp3.0
path: $(Build.ArtifactStagingDirectory)/publish
retryCountOnTaskFailure: 5

- task: DownloadPipelineArtifact@2
displayName: Download samples
inputs:
artifact: samples-multi-version-netcoreapp3.1
path: $(Build.ArtifactStagingDirectory)/publish
retryCountOnTaskFailure: 5

- task: DownloadPipelineArtifact@2
displayName: Download samples
inputs:
artifact: samples-multi-version-net5.0
path: $(Build.ArtifactStagingDirectory)/publish
retryCountOnTaskFailure: 5

- task: DownloadPipelineArtifact@2
displayName: Download samples
inputs:
artifact: samples-multi-version-net6.0
path: $(Build.ArtifactStagingDirectory)/publish
retryCountOnTaskFailure: 5

- task: DownloadPipelineArtifact@2
displayName: Download samples
inputs:
artifact: samples-multi-version-net7.0
path: $(Build.ArtifactStagingDirectory)/publish
retryCountOnTaskFailure: 5

- task: DownloadPipelineArtifact@2
displayName: Download samples
inputs:
artifact: samples-multi-version-net8.0
path: $(Build.ArtifactStagingDirectory)/publish
retryCountOnTaskFailure: 5

- task: DownloadPipelineArtifact@2
displayName: Download samples
inputs:
artifact: samples-multi-version-net9.0
path: $(Build.ArtifactStagingDirectory)/publish
retryCountOnTaskFailure: 5

- publish: $(Build.ArtifactStagingDirectory)
displayName: Upload artifact samples
artifact: samples

# This is just to test that we _can_ build the solution on macos
# It's not used by other stages, and just ensures we don't break the macos build
- stage: build_samples_macos
Expand Down Expand Up @@ -1779,12 +1694,7 @@ stages:
parameters:
includeX86: true
- template: steps/restore-working-directory.yml
- task: DownloadPipelineArtifact@2
displayName: Download samples
inputs:
artifact: samples
path: $(outputDir)
retryCountOnTaskFailure: 5
- template: steps/download-samples.yml
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we don't currently run multi-version tests on windows, so don't need to specify the framework here


# Cosmos is _way_ to flaky at the moment. Try enabling again at a later time
# - powershell: |
Expand Down Expand Up @@ -2337,12 +2247,9 @@ stages:
- template: steps/restore-working-directory.yml
parameters:
artifact: build-$(artifactSuffix)-working-directory
- task: DownloadPipelineArtifact@2
displayName: Download samples
inputs:
artifact: samples
path: $(outputDir)
retryCountOnTaskFailure: 5
- template: steps/download-samples.yml
parameters:
framework: $(publishTargetFramework)

# when we build samples separately, we could run this step and the docker-compose one below in //
# (currently the docker-compose step relies on serverless samples)
Expand Down Expand Up @@ -2421,12 +2328,9 @@ stages:
- template: steps/restore-working-directory.yml
parameters:
artifact: build-$(artifactSuffix)-working-directory
- task: DownloadPipelineArtifact@2
displayName: Download samples
inputs:
artifact: samples
path: $(outputDir)
retryCountOnTaskFailure: 5
- template: steps/download-samples.yml
parameters:
framework: $(publishTargetFramework)

# when we build samples separately, we could run this step and the docker-compose one below in //
# (currently the docker-compose step relies on serverless samples)
Expand Down Expand Up @@ -2544,12 +2448,9 @@ stages:
inputs:
artifact: linux-monitoring-home-$(artifactSuffix)
path: $(monitoringHome)
- task: DownloadPipelineArtifact@2
displayName: Download samples
inputs:
artifact: samples
path: $(outputDir)
retryCountOnTaskFailure: 5
- template: steps/download-samples.yml
parameters:
framework: $(publishTargetFramework)

- template: steps/run-in-docker.yml
parameters:
Expand Down Expand Up @@ -3145,12 +3046,9 @@ stages:
parameters:
artifact: build-$(artifactSuffix)-working-directory

- task: DownloadPipelineArtifact@2
displayName: Download samples
inputs:
artifact: samples
path: $(outputDir)
retryCountOnTaskFailure: 5
- template: steps/download-samples.yml
parameters:
framework: $(publishTargetFramework)

- template: steps/run-in-docker.yml
parameters:
Expand Down Expand Up @@ -3223,12 +3121,9 @@ stages:
- template: steps/restore-working-directory.yml
parameters:
artifact: build-$(artifactSuffix)-working-directory
- task: DownloadPipelineArtifact@2
displayName: Download samples
inputs:
artifact: samples
path: $(outputDir)
retryCountOnTaskFailure: 5
- template: steps/download-samples.yml
parameters:
framework: $(publishTargetFramework)

- template: steps/run-in-docker.yml
parameters:
Expand Down
Loading