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

2023-08-10 bump up dependencies #16397

Merged
merged 1 commit into from
Aug 10, 2023
Merged

Conversation

chaochn47
Copy link
Member

Supersedes #16382 and #16383.

#16387 and #16386 is no-op and should be closed because they are the indirect dependency of the above two packages.

#16389 is purely an indirect dependency. Since we have used the new gomerge library, I think the right way to upgrade this dependency is to wait for a new release of the library.

Please read https://github.com/etcd-io/etcd/blob/main/CONTRIBUTING.md#contribution-flow.

Copy link
Member

@jmhbnz jmhbnz left a comment

Choose a reason for hiding this comment

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

Thanks for managing it this week @chaochn47 🙏🏻

Can you please separate to individual commit per dependency as mentioned here: https://github.com/etcd-io/etcd/blob/main/Documentation/contributor-guide/dependency_management.md#steps-to-bump-a-dependency

@chaochn47
Copy link
Member Author

When you bump multiple dependencies in one PR, it's recommended to create a separate commit for each dependency. But it isn't a must; for example, you can get all dependencies bumping for the module go.etcd.io/etcd/tools/v3 included in one commit.

Since there are only two dependencies, is it okay to be included in the same commit?

Breaking them down needs to redo everything :p which I would like to avoid.

@jmhbnz
Copy link
Member

jmhbnz commented Aug 10, 2023

Since there are only two dependencies, is it okay to be included in the same commit?

Defer to a @ahrtr, like you say it's only two so maybe ok to do all as once, just had the suggested way fresh in my mind after doing it last week.

@ahrtr
Copy link
Member

ahrtr commented Aug 10, 2023

It's OK to combine the two commits, as the two dependencies are very similar and both are part of the Go project.

thx @chaochn47

@ahrtr ahrtr merged commit baf7a34 into etcd-io:main Aug 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants