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

docs: Require correct gogo import paths (backport #14852) #14853

Merged
merged 5 commits into from
Jan 31, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 31, 2023

This is an automatic backport of pull request #14852 done by Mergify.
Cherry-pick of 6a441f3 has failed:

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

You are currently cherry-picking commit 6a441f3df.
  (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:   UPGRADING.md

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 6a441f3)

# Conflicts:
#	UPGRADING.md
@mergify mergify bot requested a review from a team as a code owner January 31, 2023 13:05
@mergify mergify bot added the conflicts label Jan 31, 2023
@julienrbrt
Copy link
Member

Preparing the changelog and the release notes here too.

@julienrbrt julienrbrt self-assigned this Jan 31, 2023
@@ -80,6 +80,16 @@ Please use the `ghcr.io/cosmos/proto-builder` image (version >= `0.11.5`) for ge

See which buf commit for `cosmos/cosmos-sdk` to pin in your `buf.yaml` file [here](./proto/README.md).

#### Gogoproto Import Paths
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: to put at the correct place in main, when adding v047 changelog to main.

@julienrbrt julienrbrt removed their assignment Jan 31, 2023
@@ -8,7 +8,7 @@ require (
cosmossdk.io/depinject v1.0.0-alpha.3
cosmossdk.io/math v1.0.0-beta.4
cosmossdk.io/tools/rosetta v0.2.0
github.com/cosmos/cosmos-sdk v0.47.0-alpha2
github.com/cosmos/cosmos-sdk v0.47.0-rc2
Copy link
Member

@julienrbrt julienrbrt Jan 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changing this so it shows the correct version when going to http://127.0.0.1:1317/cosmos/base/tendermint/v1beta1/node_info from simapp built in the v0.47 branch.
It has no other effect, as we use a replace directive.

@julienrbrt julienrbrt enabled auto-merge (squash) January 31, 2023 14:00
@julienrbrt
Copy link
Member

Tagging a rc2 after this is merged.

@julienrbrt julienrbrt merged commit 5f4ddc6 into release/v0.47.x Jan 31, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-14852 branch January 31, 2023 14:38
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.

2 participants