Skip to content

ServicingPipeline: make a bunch of quality of life improvements #18830

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 6 commits into from
Apr 24, 2025

Conversation

DHowett
Copy link
Member

@DHowett DHowett commented Apr 23, 2025

We used to cherry-pick every commit that had even one card in "To Cherry Pick", even if it was also referenced by a card in "Rejected" or even "To Consider".

Now we will warn and skip those commits.

I took this opportunity to add a bit of an object model for servicing cards as well as prettify the output.

That allowed us to add a list of cards that were ignored due to having no commits, and display little icons for each type of card.

We used to cherry-pick every commit that had even one card in "To Cherry
Pick", even if it was also referenced by a card in "Rejected" or even
"To Consider".

Now we will warn and skip those commits.

I took this opportunity to add a bit of an object model for servicing
cards as well.
@DHowett
Copy link
Member Author

DHowett commented Apr 23, 2025

image

@DHowett
Copy link
Member Author

DHowett commented Apr 23, 2025

The colors match the ones in the project board (woo)

@DHowett DHowett changed the title ServicingPipeline: Ignore commits that don't agree on servicing state ServicingPipeline: make a bunch of quality of life improvements Apr 23, 2025
@DHowett DHowett merged commit 8e94983 into main Apr 24, 2025
11 checks passed
@DHowett DHowett deleted the user/duhowett/no-split-brain-cards branch April 24, 2025 18:25
@github-project-automation github-project-automation bot moved this to To Cherry Pick in 1.22 Servicing Pipeline Apr 24, 2025
@github-project-automation github-project-automation bot moved this to To Cherry Pick in 1.23 Servicing Pipeline Apr 24, 2025
@DHowett DHowett moved this from To Cherry Pick to Cherry Picked in 1.22 Servicing Pipeline Apr 24, 2025
DHowett added a commit that referenced this pull request Apr 24, 2025
We used to cherry-pick every commit that had even one card in "To Cherry
Pick", even if it was also referenced by a card in "Rejected" or even
"To Consider".

Now we will warn and skip those commits.

I took this opportunity to add a bit of an object model for servicing
cards as well as prettify the output.

That allowed us to add a list of cards that were ignored due to having
no commits, and display little icons for each type of card.

(cherry picked from commit 8e94983)
Service-Card-Id: PVTI_lADOAF3p4s4AmhmQzgZtprA
Service-Version: 1.22
@DHowett DHowett moved this from To Cherry Pick to Cherry Picked in 1.23 Servicing Pipeline Apr 24, 2025
DHowett added a commit that referenced this pull request Apr 24, 2025
We used to cherry-pick every commit that had even one card in "To Cherry
Pick", even if it was also referenced by a card in "Rejected" or even
"To Consider".

Now we will warn and skip those commits.

I took this opportunity to add a bit of an object model for servicing
cards as well as prettify the output.

That allowed us to add a list of cards that were ignored due to having
no commits, and display little icons for each type of card.

(cherry picked from commit 8e94983)
Service-Card-Id: PVTI_lADOAF3p4s4AxadtzgZtpq8
Service-Version: 1.23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Cherry Picked
Status: Cherry Picked
Development

Successfully merging this pull request may close these issues.

3 participants