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

chore(ci): cherry-pick only PRs targetting master #12820

Merged
merged 1 commit into from
Apr 2, 2024

Conversation

kikito
Copy link
Member

@kikito kikito commented Apr 1, 2024

Summary

Kong-ee uses different names for long-lived branches (they are not prefixed by release like in Kong CE).

This means that any pr targetting any branch other than master will get "confused" (since it will not find the branch it expects in EE) and throw an error.

Since our CE backport action copies the labels from the original PR, this means that all the backports are also labeled for cherrypicking. Which is not
our desired workflow: in general we want a change to be cherry-picked from kong-CE/master to kong-EE/master, and then backported to any kong-EE long-lived
branches if necessary.

This change makes the cherry-pick action ignore any PRs not targetting master to avoid these issues.

Checklist

  • The Pull Request has tests
  • A changelog file has been created under changelog/unreleased/kong or skip-changelog label added on PR if changelog is unnecessary. README.md
  • There is a user-facing docs PR against https://github.com/Kong/docs.konghq.com - PUT DOCS PR HERE

Issue reference

Fix #[issue number]

@github-actions github-actions bot added the chore Not part of the core functionality of kong, but still needed label Apr 1, 2024
@jschmid1
Copy link
Contributor

jschmid1 commented Apr 2, 2024

from https://docs.github.com/en/actions/learn-github-actions/contexts#github-context

image

lgtm as we're triggering from the "pullrequest" event.

@jschmid1 jschmid1 self-requested a review April 2, 2024 14:49
@jschmid1 jschmid1 merged commit 4d7a396 into master Apr 2, 2024
30 checks passed
@jschmid1 jschmid1 deleted the cherry-pick-from-master-only branch April 2, 2024 14:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore Not part of the core functionality of kong, but still needed size/XS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants