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

build: bump bgentry/speakasy to pseudo version (backport #14633) #14638

Merged
merged 2 commits into from
Jan 16, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 16, 2023

This is an automatic backport of pull request #14633 done by Mergify.
Cherry-pick of 6887e1d has failed:

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

You are currently cherry-picking commit 6887e1db7.
  (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/rm <file>..." as appropriate to mark resolution)
	both modified:   cosmovisor/go.sum
	both modified:   go.mod
	both modified:   go.sum
	deleted by us:   simapp/go.mod
	deleted by us:   simapp/go.sum
	deleted by us:   tests/go.mod
	deleted by us:   tests/go.sum
	deleted by us:   x/nft/go.mod

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 6887e1d)

# Conflicts:
#	cosmovisor/go.sum
#	go.mod
#	go.sum
#	simapp/go.mod
#	simapp/go.sum
#	tests/go.mod
#	tests/go.sum
#	x/nft/go.mod
@mergify mergify bot requested a review from a team as a code owner January 16, 2023 16:20
@mergify mergify bot added the conflicts label Jan 16, 2023
@julienrbrt julienrbrt self-assigned this Jan 16, 2023
@julienrbrt julienrbrt enabled auto-merge (squash) January 16, 2023 16:34
@julienrbrt julienrbrt merged commit b7a62fe into release/v0.46.x Jan 16, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.46.x/pr-14633 branch January 16, 2023 16:56
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
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.

1 participant