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

Semantic versioning for osmosis v5.x #783

Merged
merged 1 commit into from
Jan 27, 2022
Merged

Conversation

mattverse
Copy link
Member

Closes: #621

Description

This PR adds semantic versioning for v5 in the imports. It also includes change in generate-proto.sh to ensure proto files get generated in the proper directory.


For contributor use:

  • Targeted PR against correct branch (see CONTRIBUTING.md)
  • Updated relevant documentation (docs/) or specification (x/<module>/spec/)
  • Added a relevant changelog entry to the Unreleased section in CHANGELOG.md
  • Re-reviewed Files changed in the Github PR explorer

@@ -29,5 +29,5 @@ Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types:. \
$(find "${dir}" -maxdepth 1 -name '*.proto')
done

cp -r ./github.com/osmosis-labs/osmosis/* ./
cp -r ./github.com/osmosis-labs/osmosis/v*/x/* x/
Copy link
Member

Choose a reason for hiding this comment

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

Oh cool, did you test make proto-gen on this branch and it works?

Copy link
Member Author

@mattverse mattverse Jan 26, 2022

Choose a reason for hiding this comment

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

Yep! With this included, proto doesn't get confused where it should generate the proto files even with the go semantic versioning included.

With this not included: proto-gen generates proto file by making a new directory v5, which is the case we don't want

Copy link
Member

Choose a reason for hiding this comment

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

yup

Copy link
Member

@ValarDragon ValarDragon left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks for doing this. Lets merge once make proto-gen is confirmed to work / not work in the new setup

@ValarDragon ValarDragon merged commit c122bd2 into v5.x Jan 27, 2022
@ValarDragon ValarDragon deleted the mattverse/semver-v5 branch January 27, 2022 03:55
@ValarDragon ValarDragon mentioned this pull request Jan 27, 2022
5 tasks
Copy link
Member Author

@mattverse mattverse left a comment

Choose a reason for hiding this comment

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

.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants