8000 Reintroduce support for building VMR from repo PR/CI by NikolaMilosavljevic · Pull Request #548 · dotnet/dotnet · GitHub
[go: up one dir, main page]
Skip to content

Reintroduce support for building VMR from repo PR/CI #548

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 17 commits into from
May 15, 2025
Merged

Reintroduce support for building VMR from repo PR/CI #548

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8aa98bb
Add support for vmr builds in repo PRs
NikolaMilosavljevic May 6, 2025
b22303a
Few fixes for vmrBranch property propagation
NikolaMilosavljevic May 6, 2025
a24f8bd
Update template references to remove @self
NikolaMilosavljevic May 7, 2025
c5cc768
All syncing in any non-VMR run
NikolaMilosavljevic May 7, 2025
8dc8cc4
Update darc-init feed
NikolaMilosavljevic May 10, 2025
57878d0
Obtain the vmr sha
NikolaMilosavljevic May 10, 2025
17255ab
Pass the vmrBranch parameter
NikolaMilosavljevic May 10, 2025
30fe4f8
Checkout the correct sha
NikolaMilosavljevic May 11, 2025
b1350e7
Use vmr-pull-updates.yml from self
NikolaMilosavljevic May 11, 2025
ee5c0ba
Clean up vmr prep steps
NikolaMilosavljevic May 12, 2025
d8ae1fa
Pass isBuiltFromVmr to source-build-stages.yml
NikolaMilosavljevic May 13, 2025
0ec8d99
Delete unused templates and scripts
NikolaMilosavljevic May 13, 2025
7a8100c
Remove vmrBranch parameter
NikolaMilosavljevic May 13, 2025
0734954
Revert the change in darc-init.sh
NikolaMilosavljevic May 14, 2025
9981a4f
Update the comment 8000
NikolaMilosavljevic May 14, 2025
c7a4a6f
Merge branch 'main' into VmrVerificationTemplateChanges
NikolaMilosavljevic May 14, 2025
f7ec884
Merge branch 'main' into VmrVerificationTemplateChanges
NikolaMilosavljevic May 15, 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
Prev Previous commit
Next Next commit
Clean up vmr prep steps
  • Loading branch information
@NikolaMilosavljevic
NikolaMilosavljevic committed May 14, 2025
commit ee5c0ba83543f0cd296f1a7ef0edf7e840a6a59c
7 changes: 0 additions & 7 deletions eng/pipelines/templates/jobs/vmr-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,13 +329,6 @@ jobs:

steps:
- ${{ if not(parameters.isBuiltFromVmr) }}:
- template: ../steps/vmr-prepare.yml
parameters:
${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
vmrBranch: $(System.PullRequest.TargetBranch)
${{ else }}:
vmrBranch: ${{ parameters.vmrBranch }}

# Synchronize new content in the VMR during PRs (we expect this to come
Copy link
Member

Choose a reason for hiding this comment

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

This comment doesn't seem complete.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, it was the original comment I brought back along with the surrounding code. I'll remove the content in parenthesis as it doesn't add any value.

Here's the same comment in P4 branch:

dotnet/src/sdk/eng/pipelines/templates/jobs/vmr-build.yml

Line 339 in c22dcd0

# Synchronize new content in the VMR during PRs (we expect this to come

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixes with 9981a4f

- template: /eng/common/templates/steps/vmr-pull-updates.yml@self
parameters:
Expand Down
16 changes: 4 additions & 12 deletions eng/pipelines/templates/stages/vmr-build-with-join.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,19 +145,11 @@ stages:
path: $(Build.ArtifactStagingDirectory)/VerticalArtifacts/${{ vertical.job }}
artifactName: ${{ vertical.job }}_Artifacts
- ${{ if not(parameters.isBuiltFromVmr) }}:
- template: ../steps/vmr-prepare.yml
- template: /eng/common/templates/steps/vmr-pull-updates.yml@self
parameters:
${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
vmrBranch: $(System.PullRequest.TargetBranch)
${{ else }}:
vmrBranch: ${{ variables.VmrBranch }}

- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
- template: ../steps/vmr-pull-updates.yml
parameters:
vmrPath: ${{ variables.vmrPath }}
vmrBranch: ${{ variables.VmrBranch }}
targetRef: $(Build.SourceVersion) # Synchronize the current repo commit
vmrPath: ${{ variables.vmrPath }}
vmrBranch: ${{ variables.VmrBranch }}
targetRef: $(Build.SourceVersion) # Synchronize the current repo commit
- template: ../steps/vmr-join-verticals.yml
parameters:
dotNetBuildPass: final
Expand Down
0