Skip to content
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

ci: setup action for cherrypick #1312

Merged
merged 6 commits into from
Apr 25, 2023

Conversation

zirain
Copy link
Contributor

@zirain zirain commented Apr 15, 2023

  1. setup action for cherrypick by using https://github.com/carloscastrojumo/github-cherry-pick-action
  2. see demo from [release/v0.4] updat title&body zirain/test-action#9
  3. this action should be updated per release
  4. will cerate cherrypick/release-v0.4 later

NOTE: label(e.g. cherrypick/release-v0.4) should be added before merging PR.

cc @AliceProxy @arkodg @Xunzhuo

BTW, need enable following options:

image

@zirain zirain requested a review from a team as a code owner April 15, 2023 07:25
@codecov
Copy link

codecov bot commented Apr 15, 2023

Codecov Report

Merging #1312 (5808298) into main (2bf9607) will increase coverage by 0.04%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main    #1312      +/-   ##
==========================================
+ Coverage   61.79%   61.83%   +0.04%     
==========================================
  Files          76       76              
  Lines       10718    10718              
==========================================
+ Hits         6623     6628       +5     
+ Misses       3648     3645       -3     
+ Partials      447      445       -2     

see 2 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@zirain zirain added the area/ci CI and build related issues label Apr 15, 2023
@Xunzhuo
Copy link
Member

Xunzhuo commented Apr 17, 2023

It can only work for one release version? Like if we update this with v0.4.0, we can only cherry-pick commits to v0.4.0, but if I want to cherry-pick commits to v0.3.0, v0.2.0 ... It can not work, right?

@zirain
Copy link
Contributor Author

zirain commented Apr 17, 2023

It can only work for one release version? Like if we update this with v0.4.0, we can only cherry-pick commits to v0.4.0, but if I want to cherry-pick commits to v0.3.0, v0.2.0 ... It can not work, right?

Actually, I think we can make it more generic.

For now, RM (release manager) is different for each release.
Send a PR to copy these parts when RM is confirmed.
When a release is EOL, just remove those lines.

@arkodg
Copy link
Contributor

arkodg commented Apr 17, 2023

this approach sgtm, another one im seeing is https://github.com/sqren/backport/tree/main

@zirain
Copy link
Contributor Author

zirain commented Apr 18, 2023

this approach sgtm, another one im seeing is https://github.com/sqren/backport/tree/main

it looks like a CLI, not a Github action?

@arkodg
Copy link
Contributor

arkodg commented Apr 18, 2023

this approach sgtm, another one im seeing is https://github.com/sqren/backport/tree/main

it looks like a CLI, not a Github action?

yeah its a CLI + GH action https://github.com/sqren/backport-github-action

@zirain
Copy link
Contributor Author

zirain commented Apr 18, 2023

@arkodg so you think https://github.com/sqren/backport-github-action is better?
if so will you send a PR for that, I will close this.

arkodg
arkodg previously approved these changes Apr 18, 2023
Copy link
Contributor

@arkodg arkodg left a comment

Choose a reason for hiding this comment

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

LGTM thanks, good to add some guidance in release steps as a follow up to this PR

@zirain
Copy link
Contributor Author

zirain commented Apr 20, 2023

@AliceProxy you're RM of v0.4, can you take a look at this?

@Xunzhuo
Copy link
Member

Xunzhuo commented Apr 21, 2023

It can only work for one release version? Like if we update this with v0.4.0, we can only cherry-pick commits to v0.4.0, but if I want to cherry-pick commits to v0.3.0, v0.2.0 ... It can not work, right?

Actually, I think we can make it more generic.

For now, RM (release manager) is different for each release. Send a PR to copy these parts when RM is confirmed. When a release is EOL, just remove those lines.

Can we document these points in release proccess ?

Signed-off-by: hejianpeng <[email protected]>
zirain added 2 commits April 21, 2023 11:15
Signed-off-by: hejianpeng <[email protected]>
Signed-off-by: hejianpeng <[email protected]>
@zirain zirain force-pushed the setup-cherrypick-action branch from faf454b to ff215f7 Compare April 21, 2023 03:17
@zirain zirain requested a review from arkodg April 21, 2023 03:25
@zirain
Copy link
Contributor Author

zirain commented Apr 21, 2023

@Xunzhuo done

@Xunzhuo
Copy link
Member

Xunzhuo commented Apr 21, 2023

I think we need an approval from @AliceProxy

@Alice-Lilith
Copy link
Member

Sorry, I was occupied with Kubecon pretty much all last week and I didn't notice this today before I released v0.4.0. In general though I'm a +1 for this system for future releases.

@Alice-Lilith Alice-Lilith added this to the 0.5.0-rc1 milestone Apr 24, 2023
@zirain
Copy link
Contributor Author

zirain commented Apr 25, 2023

@AliceProxy can you give a approval to get this PR in?

@Alice-Lilith Alice-Lilith merged commit 29ef454 into envoyproxy:main Apr 25, 2023
@zirain zirain deleted the setup-cherrypick-action branch April 25, 2023 02:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/ci CI and build related issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants