Skip to content

Add cherry pick parameters to pipeline #78178

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 2 commits into from
Apr 22, 2025
Merged

Add cherry pick parameters to pipeline #78178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aaa80ec
Add cherry pick parameters to pipeline
dibarbet Apr 16, 2025
a7cc029
add comment
dibarbet Apr 17, 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
7 changes: 7 additions & 0 deletions azure-pipelines-official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@ parameters:
type: boolean
default: true

# An optional VS commit SHA that will be automatically cherry-picked
# to the insertion PR created by this build.
- name: VisualStudioCherryPickSHA
Copy link
Member

@jaredpar jaredpar Apr 17, 2025

Choose a reason for hiding this comment

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

Not clear what this does ... can you add a comment describing what this parameter is used for?

Copy link
Member

@jaredpar jaredpar Apr 17, 2025

Choose a reason for hiding this comment

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

Oh ... so this lets us pick a commit of VS that we want to run against? Basically means we can retest a change against the same VS baseline?

Copy link
Member Author

@dibarbet dibarbet Apr 17, 2025

Choose a reason for hiding this comment

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

not exactly - it allows us to cherry-pick a commit from another VS branch onto our insertion branch. For example if we need to do a dual insertion, or a roslyn change requires another VS-side change. Instead of having to wait for the PR to be created, then cherry-pick it over, the roslyn insertion tool can do it when it creates the insertion

type: string
default: '(default)'

schedules:
- cron: "0 8 23-29 * 0"
displayName: "Monthly smoke test"
Expand Down Expand Up @@ -394,6 +400,7 @@ extends:
publishDataURI: "https://dev.azure.com/dnceng/internal/_apis/git/repositories/dotnet-roslyn/items?path=eng/config/PublishData.json&api-version=6.0"
publishDataAccessToken: "$(System.AccessToken)"
dropPath: '$(Pipeline.Workspace)\VSSetup'
cherryPick: ${{ parameters.VisualStudioCherryPickSHA }}

- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- template: /eng/common/templates-official/post-build/post-build.yml@self
Expand Down
4 changes: 4 additions & 0 deletions azure-pipelines-pr-validation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ parameters:
- name: OptionalTitlePrefix
type: string
default: '[PR Validation]'
- name: VisualStudioCherryPickSHA
type: string
default: '(default)'
- name: InsertToolset
type: boolean
default: true
Expand Down Expand Up @@ -323,6 +326,7 @@ extends:
queueSpeedometerValidation: true
dropPath: '$(Pipeline.Workspace)\VSSetup'
retainInsertedBuild: false
cherryPick: ${{ parameters.VisualStudioCherryPickSHA }}
# Arcade is done so we can set BuildNumber back
- powershell: Write-Host "##vso[build.updatebuildnumber]$(FancyBuildNumber)"
displayName: Reset BuildNumber
Expand Down
5 changes: 4 additions & 1 deletion eng/pipelines/insert.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ parameters:
type: string
default: ''

- name: cherryPick
type: string

steps:
- checkout: none

Expand Down Expand Up @@ -183,7 +186,7 @@ steps:
.\RIT\tools\net472\OneOffInsertion.ps1 `
-autoComplete "$(Template.AutoComplete)" `
-buildQueueName "$(Build.DefinitionName)" `
-cherryPick "(default)" `
-cherryPick "${{ parameters.cherryPick }}" `
-userName "$(Template.BuildUserName)" `
-password "$(Template.BuildPassword)" `
-componentUserName "$(Template.ComponentUserName)" `
Expand Down