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

feat: make StartCmd more customizable (backport #16209) #16228

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 19, 2023

This is an automatic backport of pull request #16209 done by Mergify.
Cherry-pick of de75e56 has failed:

On branch mergify/bp/release/v0.47.x/pr-16209
Your branch is up to date with 'origin/release/v0.47.x'.

You are currently cherry-picking commit de75e568b.
  (fix conflicts and 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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   server/start.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit de75e56)

# Conflicts:
#	CHANGELOG.md
#	server/start.go
@mergify mergify bot requested a review from a team as a code owner May 19, 2023 09:44
@mergify mergify bot added the conflicts label May 19, 2023
Comment on lines +514 to +518
if opts.PostSetup != nil {
if err := opts.PostSetup(svrCtx, clientCtx, ctx, g); err != nil {
return err
}
}

Check warning

Code scanning / CodeQL

Unreachable statement

This statement is unreachable.
@julienrbrt
Copy link
Member

blocked on #16207

@tac0turtle
Copy link
Member

i dont think we should backport this

@julienrbrt
Copy link
Member

i dont think we should backport this

This one is somewhat not breaking, but because one option has an argument that is available only in #16207 it is blocked.
It's a good improvement that we could indeed keep for Eden however 👍🏾

@julienrbrt julienrbrt closed this May 19, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-16209 branch May 19, 2023 10:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

3 participants