History

Liu Shilong 1c3bf41b89 [workflow] Use automerge_scan instead of automerge for correct commit message. (#17669 ) Why I did it automerge and automerge_scan have different behavior when merging PRs. automerge may left some PRs unmerged. So, use automerge_scan instead. Work item tracking Microsoft ADO (number only): 26361240 How I did it How to verify it		2024-01-09 20:28:18 +08:00
..
automerge_scan.yml	[action] Update workflow to parse & monitor pending automation PRs. (#16446 )	2023-09-07 13:34:34 +08:00
automerge.yml	[workflow] Use automerge_scan instead of automerge for correct commit message. (#17669 )	2024-01-09 20:28:18 +08:00
codeql-analysis.yml	[action] Update github actions on trigger and label. (#13542 )	2023-01-30 16:57:39 +08:00
label.yml	[action] Only add 'automerge' label on master version upgrade PR. (#15112 )	2023-05-17 18:09:12 +08:00
pr_cherrypick_poststep.yml	[action] Update github actions on trigger and label. (#13542 )	2023-01-30 16:57:39 +08:00
pr_cherrypick_prestep.yml	[action] Update github workflows about automerge_scan and pr_cherrypick_prestep. (#15090 )	2023-05-17 11:06:50 +08:00
README.md	[actions] Add auto cherry-pick actions to release branch (#11496 )	2022-10-10 16:55:00 +08:00
semgrep.yml	[action] Update github actions on trigger and label. (#13542 )	2023-01-30 16:57:39 +08:00

README.md

Github actions README

This is an introduction about auto-cherry-pick workflow. take 202205 branch for example:

pr_cherrypick_prestep:

graph
Start(Origin PR) --> A{merged?}
A -- NO --> STOP
A -- YES --> A1{Approved<br> for 202205<br> Branch?}
A1 -- NO --> STOP
A1 -- YES --> A2(pr_cherrypick_prestep)
B(pr_cherrypick_prestep)
B --> B1{cherry pick<br>conflict?}
B1 -- YES --> B2(Add tag:<br>Cherry Pick Confclit_202205) --> B3(Add comment:<br>refer author code conflict) --> STOP1(STOP)
B1 -- NO --> B4(Create New PR) -- success --> B5(New PR add tag:<br> automerge) --> B6(New PR add comment:<br>Origin PR link) --> B7(Origin PR add tag:<br>Created PR to 202205 Branch) --> B8(Origin PR add comment:<br>New PR link)
B4 -- fail --> STOP1

automerge:

graph
Start(PR azp finished successfully) --> A{author:<br>mssonicbld?}
A -- NO --> STOP
A -- YES --> B{tag:<br>automerge?} -- YES --> C(Merge PR)
B -- NO --> STOP

pr_cherrypick_poststep:

graph
A(PR is Merged) --> B{tag:<br>automerge?}
B -- YES --> B1{author:<br>mssonicbld?}
B1 -- YES --> B2{"title starts:<br>[action] [PR:123]"}
B2 -- YES --> C(Origin PR remove tag:<br> Created PR to 202205 Branch) --> D(Origin PR add tag:<br> Included in 202205 Branch)
B -- NO --> STOP
B1 -- NO --> STOP
B2 -- NO --> STOP