-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Remove primary vertical concept from JoinVerticals #47338
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
Merged
Merged
Changes from 4 commits
Commits
Show all changes
27 commits
Select commit
Hold shift + click to select a range
65e4475
Remove primary vertical concept from JoinVerticals
jkoritzinsky f9ba8d1
Merge dotnet/main into rid-specific-publish
jkoritzinsky 7dcb882
Restore disabled IBC (disabled due to MSBuild failures)
jkoritzinsky 7e42c98
Forward isSourceOnlyBuild down
jkoritzinsky 2df41a5
Change our handling of EnableDefaultRidSpecificArtifacts and DefaultA…
jkoritzinsky 1cfe7d2
Remove dead code
jkoritzinsky 1f64d96
Allow an empty sign list for repos that don't have RID-specific artif…
jkoritzinsky ece002c
Add backport for nuget change
jkoritzinsky 61048cc
Update 0001-support-rid-agnostic-publishing.patch
jkoritzinsky bbf24bf
Update Publishing.props
jkoritzinsky be6b487
Merge branch 'main' of https://github.com/dotnet/sdk into rid-specifi…
jkoritzinsky 70c62d5
Join in non-source-only even in PR.
jkoritzinsky 7febe6c
Cleanup patches
jkoritzinsky 0bac6e3
Remove guard on AllowEmptySignList
jkoritzinsky 98cbc42
Merge branch 'main' of https://github.com/dotnet/sdk into rid-specifi…
jkoritzinsky 92f9f69
Include the variables template in the final join stage
jkoritzinsky 9e50d17
Fix path for join-verticals script in sdk.
jkoritzinsky baa945c
Clone and sync the vmr in the join job when building it from sdk
jkoritzinsky 5d6a5cd
Try different approach for the vmr branch and adjust the artifacts name
jkoritzinsky 02c0196
Move variables up a scope
jkoritzinsky 5ce08e6
Try fetching the path differently
jkoritzinsky 4b7fa8e
Add download steps for the public build
jkoritzinsky e3d0e4c
Merge branch 'main' of github.com:dotnet/sdk into rid-specific-publish
jkoritzinsky 28c6c5b
Add parameter for forwarding
jkoritzinsky 172bbce
Inline always-true if body
jkoritzinsky a96232f
Make unmatched assets an error
jkoritzinsky 3d66265
Log unmatched assets only when there are any
jkoritzinsky File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jkoritzinsky marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,112 @@ | ||
parameters: | ||
- name: verticalsStages | ||
type: stageList | ||
- name: postJoinStages | ||
type: stageList | ||
default: [] | ||
- name: finalJoinCondition | ||
type: boolean | ||
# These are not expected to be passed it but rather just object variables reused below | ||
- name: pool_Linux | ||
type: object | ||
default: | ||
name: $(defaultPoolName) | ||
image: $(poolImage_Linux) | ||
demands: ImageOverride -equals $(poolImage_Linux) | ||
os: linux | ||
|
||
- name: pool_Windows | ||
type: object | ||
default: | ||
name: $(defaultPoolName) | ||
image: $(poolImage_Windows) | ||
demands: ImageOverride -equals $(poolImage_Windows) | ||
os: windows | ||
|
||
- name: pool_LinuxArm64 | ||
type: object | ||
default: | ||
name: $(poolName_LinuxArm64) | ||
image: $(poolImage_LinuxArm64) | ||
demands: ImageOverride -equals $(poolImage_LinuxArm64) | ||
hostArchitecture: Arm64 | ||
os: linux | ||
|
||
- name: pool_Mac | ||
type: object | ||
default: | ||
name: Azure Pipelines | ||
vmImage: $(poolImage_Mac) | ||
os: macOS | ||
|
||
|
||
- name: pool_Linux_Shortstack | ||
type: object | ||
default: | ||
name: $(shortStackPoolName) | ||
image: $(poolImage_Linux) | ||
demands: ImageOverride -equals $(poolImage_Linux) | ||
os: linux | ||
|
||
stages: | ||
- ${{ each vertical in parameters.verticalsStages }}: | ||
- ${{ insert }}: ${{ vertical }} | ||
- ${{ if parameters.finalJoinCondition }}: | ||
- stage: VMR_Final_Join | ||
displayName: 'VMR Final Join' | ||
dependsOn: ${{ parameters.verticalsStages.*.stage }} | ||
jobs: | ||
- job: FinalJoin | ||
displayName: Final Build Pass | ||
pool: ${{ parameters.pool_Windows }} | ||
timeoutInMinutes: 240 | ||
templateContext: | ||
outputParentDirectory: $(Build.ArtifactStagingDirectory)/artifacts | ||
inputs: | ||
- ${{ each vertical in parameters.verticalsStages.*.jobs.*.job }}: | ||
- input: pipelineArtifact | ||
path: $(Build.ArtifactStagingDirectory)/VerticalArtifacts/${{ vertical }} | ||
artifactName: ${{ vertical }}_Artifacts | ||
- input: pipelineArtifact | ||
path: $(Build.ArtifactStagingDirectory)/VerticalManifests | ||
artifactName: VerticalManifests | ||
outputs: | ||
- output: pipelineArtifact | ||
path: $(Build.ArtifactStagingDirectory)/artifacts/MergedManifest.xml | ||
artifact: AssetManifests | ||
displayName: Publish Merged Manifest | ||
sbomEnabled: false | ||
- output: buildArtifacts | ||
PathtoPublish: $(Build.ArtifactStagingDirectory)/artifacts/assets | ||
ArtifactName: BlobArtifacts | ||
displayName: Publish Blob Artifacts | ||
sbomEnabled: false | ||
- output: buildArtifacts | ||
PathtoPublish: $(Build.ArtifactStagingDirectory)/artifacts/packages | ||
ArtifactName: PackageArtifacts | ||
displayName: Publish Package Artifacts | ||
sbomEnabled: false | ||
- output: pipelineArtifact | ||
path: $(Build.ArtifactStagingDirectory)/artifacts/log | ||
artifact: JoinVerticals_BuildLogs_Attempt$(System.JobAttempt) | ||
displayName: Publish Build Logs | ||
sbomEnabled: false | ||
condition: succeededOrFailed() | ||
steps: | ||
- template: ../steps/vmr-join-verticals.yml | ||
parameters: | ||
dotNetBuildPass: final | ||
outputFolder: $(Build.ArtifactStagingDirectory)/artifacts | ||
# Insert all of the validation stages, | ||
# adding a dependency on the final join stage | ||
- ${{ each postJoinStage in parameters.postJoinStages }}: | ||
- stage: ${{ postJoinStage.stage }} | ||
${{ each pair in postJoinStage }}: | ||
${{ if notIn(pair.key, 'dependsOn', 'stage') }}: | ||
${{ pair.key }}: ${{ pair.value }} | ||
dependsOn: | ||
- VMR_Final_Join | ||
# add any dependencies provided via root yaml | ||
- ${{ if ne(postJoinStage.dependsOn, '') }}: | ||
- ${{ each dependency in postJoinStage.dependsOn }}: | ||
- ${{ dependency }} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.