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
General fixes for release-tool #7238
Conversation
Signed-off-by: Sebastian Malton <sebastian@malton.name>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What does it mean when this appears:
Please resolve conflicts in a separate terminal and then press enter here...
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:
git commit --allow-empty
Otherwise, please use 'git cherry-pick --skip'
On branch more-fixes-release-tool
Your branch is up to date with 'origin/more-fixes-release-tool'.
You are currently cherry-picking commit 2550b1efbd.
(all conflicts fixed: run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: package-lock.json
no changes added to commit (use "git add" and/or "git commit -a")
Please resolve conflicts in a separate terminal and then press enter here...
The cherry-pick succeeded without conflicts? Or the commit was already in the branch? If it is already in the branch then it should probably be removed from the list of commits for the release. Feels like this should proceed to the next cherry-pick without user interaction.
This is just how git works. I don't want to try and parse git output.... I think that |
Signed-off-by: Sebastian Malton <sebastian@malton.name>
* General fixes for release-tool Signed-off-by: Sebastian Malton <sebastian@malton.name> * Revert change to number of PRs retrieved Signed-off-by: Sebastian Malton <sebastian@malton.name> --------- Signed-off-by: Sebastian Malton <sebastian@malton.name>
* General fixes for release-tool (#7238) * General fixes for release-tool Signed-off-by: Sebastian Malton <sebastian@malton.name> * Revert change to number of PRs retrieved Signed-off-by: Sebastian Malton <sebastian@malton.name> --------- Signed-off-by: Sebastian Malton <sebastian@malton.name> * Throw on errors in kubectlApplyFolder (#7239) Signed-off-by: Panu Horsmalahti <phorsmalahti@mirantis.com> * Quick fix for store migration version being wrong (#7243) Signed-off-by: Sebastian Malton <sebastian@malton.name> * Revert "Renderer file logging transport (#6795)" (#7245) Renderer file logging still caused UI freezing (at least on apple silicon macs) when cluster frame was open and main frame was reloaded. See #544 This reverts commit ac2d0e4. Signed-off-by: Sami Tiilikainen <97873007+samitiilikainen@users.noreply.github.com> * Fix extension install (#7247) * Fix extension install - Remove old bundled extension dependencies - Make sure external extensions are installed as optional Signed-off-by: Sebastian Malton <sebastian@malton.name> * Ignore ENOENT errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add comment Signed-off-by: Sebastian Malton <sebastian@malton.name> --------- Signed-off-by: Sebastian Malton <sebastian@malton.name> * Release 6.4.0 Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix lint Signed-off-by: Sebastian Malton <sebastian@malton.name> --------- Signed-off-by: Sebastian Malton <sebastian@malton.name> Signed-off-by: Panu Horsmalahti <phorsmalahti@mirantis.com> Signed-off-by: Sami Tiilikainen <97873007+samitiilikainen@users.noreply.github.com> Co-authored-by: Panu Horsmalahti <phorsmalahti@mirantis.com> Co-authored-by: Sami Tiilikainen <97873007+samitiilikainen@users.noreply.github.com>
Found while making #7237