Skip to content

Conversation

@adigidh
Copy link
Contributor

@adigidh adigidh commented Jan 23, 2025

fixes #484

…n to release

Signed-off-by: Aditya Gidh <aagidh@us.ibm.com>
Signed-off-by: Aditya Gidh <aagidh@us.ibm.com>
Signed-off-by: Aditya Gidh <aagidh@us.ibm.com>
Copy link
Member

@vishnoianil vishnoianil left a comment

Choose a reason for hiding this comment

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

This is great! @adigidh . One question, i think with this implementation, it will cherry-pick every PR to the release-1.0 branch, but we would like to cherry-pick only if the PR is tagged with cherry-pick-release-1.0 label.

Signed-off-by: Aditya Gidh <aagidh@us.ibm.com>
@adigidh
Copy link
Contributor Author

adigidh commented Jan 24, 2025

This is great! @adigidh . One question, i think with this implementation, it will cherry-pick every PR to the release-1.0 branch, but we would like to cherry-pick only if the PR is tagged with cherry-pick-release-1.0 label.

@vishnoianil : Thank you for taking a look. I made an update to add some conditional logic in the YAML. This will ensure that the cherry-pick action only runs when a PR is merged and the specific label cherry-pick-release-1.0.

jobs:
cherry_pick_release_1_0:
cherry_pick:
if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'cherry-pick release-1.0')
Copy link
Member

Choose a reason for hiding this comment

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

minor nit : the existing label name is "cherry-pick-release-1.0"

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch! My bad, updated and pushed the correct label name.

@vishnoianil
Copy link
Member

This is great! @adigidh . One question, i think with this implementation, it will cherry-pick every PR to the release-1.0 branch, but we would like to cherry-pick only if the PR is tagged with cherry-pick-release-1.0 label.

@vishnoianil : Thank you for taking a look. I made an update to add some conditional logic in the YAML. This will ensure that the cherry-pick action only runs when a PR is merged and the specific label cherry-pick-release-1.0.

@adigidh minor comment, but otherwise PR looks good. Once you address the comment, will merge the PR.

Signed-off-by: Aditya Gidh <aagidh@us.ibm.com>
Copy link
Member

@vishnoianil vishnoianil 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 for the PR, appreciate it @adigidh

@vishnoianil vishnoianil merged commit 901b1e2 into instructlab:main Jan 24, 2025
8 checks passed
@vishnoianil
Copy link
Member

@adigidh Merged the PR, can you test this by creating a simple PR (e.g minor change in the readme file) and I can merge it to master and let's see if the job automatically cherry-pick it for release-1.0 branch.

@adigidh
Copy link
Contributor Author

adigidh commented Jan 24, 2025

@vishnoianil : created #493 to test this workflow out

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Enable auto cherry-picking from main to release branch

2 participants