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: frontend dependencies bumps #3640

Merged
merged 2 commits into from
Oct 21, 2024
Merged

Conversation

korniltsev
Copy link
Collaborator

@korniltsev korniltsev commented Oct 21, 2024

Tested with make frontend/build and opening some flamegraphs in debug ui

@korniltsev korniltsev requested a review from a team as a code owner October 21, 2024 08:37
@korniltsev korniltsev added the backport release/v1.9 This label will backport a merged PR to the release/v1.9 branch label Oct 21, 2024
Copy link
Contributor

Hello @korniltsev!
Backport pull requests need to be either:

  • Pull requests which address bugs,
  • Urgent fixes which need product approval, in order to get merged,
  • Docs changes.

Please, if the current pull request addresses a bug fix, label it with the type/bug label.
If it already has the product approval, please add the product-approved label. For docs changes, please add the type/docs label.
If the pull request modifies CI behaviour, please add the type/ci label.
If none of the above applies, please consider removing the backport label and target the next major/minor release.
Thanks!

@korniltsev korniltsev added the type/bug Something isn't working label Oct 21, 2024
Copy link
Contributor

This PR must be merged before a backport PR will be created.

@korniltsev korniltsev merged commit ec5e5ba into main Oct 21, 2024
20 checks passed
@korniltsev korniltsev deleted the korniltsev/frontend_cves branch October 21, 2024 08:46
Copy link
Contributor

The backport to release/v1.9 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 branch
git switch --create backport-3640-to-release/v1.9 origin/release/v1.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x ec5e5ba3f3a079c567c34c120f3a031b97660f20

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-3640-to-release/v1.9
# Create the PR body template
PR_BODY=$(gh pr view 3640 --json body --template 'Backport ec5e5ba3f3a079c567c34c120f3a031b97660f20 from #3640{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release/v1.9] chore: frontend dependencies bumps' --body-file - --label 'type/bug' --label 'backport' --base release/v1.9 --milestone release/v1.9 --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-3640-to-release/v1.9

# Create a pull request where the `base` branch is `release/v1.9` and the `compare`/`head` branch is `backport-3640-to-release/v1.9`.

# Remove the local backport branch
git switch main
git branch -D backport-3640-to-release/v1.9

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release/v1.9 This label will backport a merged PR to the release/v1.9 branch backport-failed type/bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants