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

fix(kconfig): retrieve edtion from info instead of from kconfig.js -FTI-5557 #149

Merged
merged 1 commit into from
Dec 28, 2023

Conversation

raoxiaoyan
Copy link
Contributor

@raoxiaoyan raoxiaoyan commented Dec 28, 2023

Summary

Issue reference

FTI-5557

@raoxiaoyan raoxiaoyan changed the title fix(kconfig): retrieve edtion from info instead of from kconfig.js fix(kconfig): retrieve edtion from info instead of from kconfig.js -FTI-5557 Dec 28, 2023
@raoxiaoyan raoxiaoyan force-pushed the fix/edtion branch 2 times, most recently from 97934a1 to 98107ac Compare December 28, 2023 03:55
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 merged commit 5aeae7b into main Dec 28, 2023
18 checks passed
@raoxiaoyan raoxiaoyan deleted the fix/edtion branch December 28, 2023 06:48
@raoxiaoyan raoxiaoyan added backport release/3.4.x PRs should be cherry-picked to release/3.4.x backport release/3.5.x labels Dec 28, 2023
@team-gateway-bot
Copy link
Collaborator

The backport to release/3.5.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.5.x release/3.5.x
# Navigate to the new working tree
cd .worktrees/backport-release/3.5.x
# Create a new branch
git switch --create backport-149-to-release/3.5.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5aeae7b7f7c39377f7a704615946f49027ef00b7
# Push it to GitHub
git push --set-upstream origin backport-149-to-release/3.5.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/3.5.x

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

@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-149-to-release/3.4.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5aeae7b7f7c39377f7a704615946f49027ef00b7
# Push it to GitHub
git push --set-upstream origin backport-149-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-149-to-release/3.4.x.

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.

3 participants