Skip to content

cherry pick to chosen branch #7678

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

cherry pick to chosen branch #7678

wants to merge 3 commits into from

Conversation

pdabelf5
Copy link
Collaborator

@pdabelf5 pdabelf5 commented Apr 17, 2025

Proposed changes

Change cherry-pick logic to be based off comments from authorised users. Only works on already merged PR's. Users can choose which release branch to cherry pick to and can comment for additional release branches as well as the current release branch.

Usage

/cherry-pick to release-4.0
/cherry-pick to release-5.0

Checklist

Before creating a PR, run through this checklist and mark each as complete.

  • I have read the CONTRIBUTING doc
  • I have added tests that prove my fix is effective or that my feature works
  • I have checked that all unit tests pass after adding my changes
  • I have updated necessary documentation
  • I have rebased my branch onto main
  • I will ensure my PR is targeting the main branch and pulling from my branch from my own fork

@pdabelf5 pdabelf5 requested a review from a team as a code owner April 17, 2025 15:48
@github-actions github-actions bot added github_actions Pull requests that update Github_actions code chore Pull requests for routine tasks labels Apr 17, 2025
@ADubhlaoich
Copy link
Contributor

@pdabelf5 Could you make a similar PR in the documentation rep once this has gone through merge/testing/etc?

steps:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
token: ${{ secrets.NGINX_PAT }}

- name: Check if Actor is a Member of one of the teams
uses: im-open/[email protected]
Copy link
Contributor

Choose a reason for hiding this comment

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

We should pin this to a specific commit so dependabot got pickup the updates

@@ -15,23 +14,43 @@ jobs:
pull-requests: write
runs-on: ubuntu-22.04
name: Cherry pick into release branch
if: ${{ (contains(github.event.pull_request.labels.*.name, 'dependencies') || contains(github.event.pull_request.labels.*.name, 'needs cherry pick')) && github.event.pull_request.merged == true }}
if: ${{ github.event.issue.pull_request.merged_at != null }}
steps:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
token: ${{ secrets.NGINX_PAT }}
Copy link
Contributor

Choose a reason for hiding this comment

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

Is the reason for the NGINX_PAT usage, to allow automatic triggering of downstream actions?
If we cannot use a GITHUB_TOKEN, we'll need to make sure the NGINX_PAT is available in the docs.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore Pull requests for routine tasks github_actions Pull requests that update Github_actions code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants