chore: bump core v1.31.0-tm-v0.34.29 #2979
Conversation
WalkthroughThe update to the Makefile introduces a new command within the Changes
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? TipsChatThere are 3 ways to chat with CodeRabbit's AI:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (invoked as PR comments)
Additionally, you can add CodeRabbit Configration File (
|
evan-forbes
added
the
backport:v1.x
| @@ -41,6 +41,8 @@ install: go.sum | |||
| mod: | |||
| @echo "--> Updating go.mod" | |||
| @go mod tidy | |||
| @echo "--> Updating go.mod in ./test/testground" | |||
| @(cd ./test/testground && go mod tidy) | |||
There was a problem hiding this comment.
do we want a go work sync prior to both of these commands?
| @@ -41,6 +41,8 @@ install: go.sum | |||
| mod: | |||
| @echo "--> Updating go.mod" | |||
| @go mod tidy | |||
| @echo "--> Updating go.mod in ./test/testground" | |||
| @(cd ./test/testground && go mod tidy) | |||
There was a problem hiding this comment.
do we want a go work sync prior to both of these commands?
super sorry about that, I didn't see it until this morning and was too focused on cleaning up the leftover from the inscription stuff! fixed 🙂 |
evan-forbes
dismissed stale reviews from cmwaters, rootulp, and staheri14
via
ac5bde2
evan-forbes
changed the title
## Overview updates to the latest version of core modifies `make mod` to automate calling `go work sync`, and then `go mod tidy` twice, once for the root, and then again for the testground subdir (cherry picked from commit 23d13d4) # Conflicts: # go.mod # go.sum # go.work.sum # test/testground/go.mod # test/testground/go.sum
This is an automatic backport of pull request #2979 done by [Mergify](https://mergify.com). Cherry-pick of 23d13d4 has failed: ``` On branch mergify/bp/v1.x/pr-2979 Your branch is up to date with 'origin/v1.x'. You are currently cherry-picking commit 23d13d4. (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) Changes to be committed: modified: Makefile Unmerged paths: (use "git add/rm <file>..." as appropriate to mark resolution) both modified: go.mod both modified: go.sum deleted by us: go.work.sum deleted by us: test/testground/go.mod deleted by us: test/testground/go.sum ``` 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 --- <details> <summary>Mergify commands and options</summary> <br /> More conditions and actions can be found in the [documentation](https://docs.mergify.com/). 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](https://dashboard.mergify.com) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com </details> --------- Co-authored-by: Evan Forbes <[email protected]> Co-authored-by: evan-forbes <[email protected]>
Overview
updates to the latest version of core
modifies
make modto automate callinggo work sync, and thengo mod tidytwice, once for the root, and then again for the testground subdir