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: find a way to reenable the cherry-picker process #3958

Closed
wants to merge 2 commits into from

Conversation

Manoramsharma
Copy link
Contributor

What type of PR is this?

CI workflow

What this PR does / why we need it:

This PR introduces a custom GitHub Actions workflow to automate the cherry-picking of merged pull requests with a specific label into a target branch. This automation simplifies the release management process and ensures that critical changes are propagated to the necessary branches efficiently.

Which issue(s) this PR fixes:

Fixes #3946

Changes made in this PR:

  • Added a new GitHub Actions workflow (cherry-picker.yml) to automate the cherry-picking process.
  • The workflow is triggered when a pull request targeting the main branch is closed.
  • The workflow checks if the pull request has the label cherrypick/release-v1.1 and if it was merged.
  • The workflow includes steps to:
    • Checkout the repository.
    • Configure Git with the GitHub Actions bot user.
    • Cherry-pick the merge commit into the target branch release/v1.1.
    • Push the changes to the target branch.
  • Ensured the workflow adheres to linting standards by removing trailing spaces and properly formatting comments.

Additional context:

This workflow helps in reducing manual effort for the release manager by automating the process of cherry-picking merged PRs with specific labels into their respective release branches.

Signed-off-by: Manoramsharma <img_2020037@iiitm.ac.in>
@Manoramsharma Manoramsharma requested a review from a team as a code owner July 27, 2024 07:40
Copy link

codecov bot commented Jul 27, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 67.45%. Comparing base (b4b2985) to head (07acb97).
Report is 294 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3958      +/-   ##
==========================================
+ Coverage   67.36%   67.45%   +0.09%     
==========================================
  Files         183      183              
  Lines       22443    22443              
==========================================
+ Hits        15118    15140      +22     
+ Misses       6233     6217      -16     
+ Partials     1092     1086       -6     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@zirain zirain left a comment

Choose a reason for hiding this comment

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

directly push to target branch is not allowed

Signed-off-by: Manoramsharma <img_2020037@iiitm.ac.in>
@Manoramsharma Manoramsharma requested a review from zirain July 27, 2024 11:27
@Manoramsharma Manoramsharma changed the title Find a way to reenable the cherry-picker process ci: find a way to reenable the cherry-picker process Jul 27, 2024
types: ["closed"]

permissions:
contents: read
Copy link
Contributor

Choose a reason for hiding this comment

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

can we create branch with read permission?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you for pointing that out. I should have update the permissions in the workflow to ensure that the action can create and push branches. The permissions should be set to contents: write and pull-requests: write.

Copy link
Contributor

Choose a reason for hiding this comment

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

@Manoramsharma thanks for you work, but I think this's not a good issue for begginer(this one need a lot of collaborations with the Envoyproxy org admin).

Copy link

This pull request has been automatically marked as stale because it has not had activity in the last 30 days. Please feel free to give a status update now, ping for review, when it's ready. Thank you for your contributions!

@github-actions github-actions bot added the stale label Aug 27, 2024
@zirain
Copy link
Contributor

zirain commented Oct 23, 2024

As we discussed, we won't need this for now.
I'd like to close this first, feel free to reopen.

@zirain zirain closed this Oct 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Find a way to reenable the cherry-picker process
2 participants