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

(backport to 3.5.x)fix(kconfig): remove kong version from kconfig.js-FTI-5557 #146

Merged
merged 2 commits into from
Dec 28, 2023

Conversation

raoxiaoyan
Copy link
Contributor

@raoxiaoyan raoxiaoyan commented Dec 25, 2023

@raoxiaoyan raoxiaoyan changed the title fix(kconfig): remove kong version from kconfig.js (backport to 3.5.x)fix(kconfig): remove kong version from kconfig.js Dec 25, 2023
@raoxiaoyan
Copy link
Contributor Author

Waiting for this PR to be merged. Kong/kong#12150

@raoxiaoyan
Copy link
Contributor Author

Waiting for this PR to be merged. https://github.com/Kong/kong-ee/pull/7679

@raoxiaoyan raoxiaoyan marked this pull request as draft December 25, 2023 07:25
Copy link
Contributor

@nekolab nekolab left a comment

Choose a reason for hiding this comment

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

LGTM

@raoxiaoyan raoxiaoyan changed the title (backport to 3.5.x)fix(kconfig): remove kong version from kconfig.js (backport to 3.5.x)fix(kconfig): remove kong version from kconfig.js-FTI-5557 Dec 28, 2023
@raoxiaoyan raoxiaoyan marked this pull request as ready for review December 28, 2023 07:51
@raoxiaoyan raoxiaoyan merged commit 94b8b34 into release/3.5.x Dec 28, 2023
18 checks passed
@raoxiaoyan raoxiaoyan deleted the backport_to_3.5.x/126 branch December 28, 2023 07:53
@raoxiaoyan raoxiaoyan added the backport release/3.4.x PRs should be cherry-picked to release/3.4.x label Dec 28, 2023
@team-gateway-bot
Copy link
Collaborator

The backport to release/3.4.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release/3.4.x release/3.4.x
# Navigate to the new working tree
cd .worktrees/backport-release/3.4.x
# Create a new branch
git switch --create backport-146-to-release/3.4.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 94b8b34b2379fa919c34cb3252d9e7befcff3aac
# Push it to GitHub
git push --set-upstream origin backport-146-to-release/3.4.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/3.4.x

Then, create a pull request where the base branch is release/3.4.x and the compare/head branch is backport-146-to-release/3.4.x.

raoxiaoyan added a commit that referenced this pull request Dec 29, 2023
…FTI-5557 (#146)

* fix(kconfig): remove kong version from kconfig.js

* fix(kconfig): retrieve edition from info instead of from kconfig.js
raoxiaoyan added a commit that referenced this pull request Jan 4, 2024
…FTI-5557 (#146)

* fix(kconfig): remove kong version from kconfig.js

* fix(kconfig): retrieve edition from info instead of from kconfig.js
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release/3.4.x PRs should be cherry-picked to release/3.4.x
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants