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(release): forward 3.7.0 changelog to master #13145

Merged
merged 2 commits into from
Jun 3, 2024

Conversation

AndyZhang0707
Copy link
Collaborator

@AndyZhang0707 AndyZhang0707 commented Jun 3, 2024

Summary

Forward merge 3.7.0 changelog generation PRs to master:
#12965
#13058

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

KAG-4422

Fix #[issue number]

@AndyZhang0707 AndyZhang0707 requested review from kikito and locao June 3, 2024 09:11
@AndyZhang0707 AndyZhang0707 marked this pull request as ready for review June 3, 2024 09:11
@AndyZhang0707
Copy link
Collaborator Author

Don't need to cherry-pick to EE.

@github-actions github-actions bot added core/docs cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee labels Jun 3, 2024
AndyZhang0707 and others added 2 commits June 3, 2024 14:39
Co-authored-by: lena-larionova <[email protected]>
Co-authored-by: Vinicius Mignot <[email protected]>
@kikito kikito force-pushed the forward-backport-3.7.0-changelog branch from 8bfb8c2 to 59d9c6b Compare June 3, 2024 12:39
@kikito
Copy link
Member

kikito commented Jun 3, 2024

rebased over master in order to fix conflicts. Merging when green

@kikito kikito merged commit 24c7ef9 into master Jun 3, 2024
5 checks passed
@kikito kikito deleted the forward-backport-3.7.0-changelog branch June 3, 2024 12:40
@team-gateway-bot
Copy link
Collaborator

Cherry-pick failed for master, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git remote add upstream https://github.com/kong/kong-ee
git fetch upstream master
git worktree add -d .worktree/cherry-pick-13145-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-13145-to-master-to-upstream
git checkout -b cherry-pick-13145-to-master-to-upstream
ancref=$(git merge-base e90cafc54cdb04dbd78a6d52db4410af9f12ffd7 59d9c6b4feab5cd61bf36e8f288db8b7ff4ffda3)
git cherry-pick -x $ancref..59d9c6b4feab5cd61bf36e8f288db8b7ff4ffda3

@github-actions github-actions bot added the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Jun 3, 2024
@kikito
Copy link
Member

kikito commented Jun 4, 2024

No need to cherrypick this one. Removing label.

@kikito kikito removed incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee labels Jun 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants