Skip to content

[release/2.2] bump google.golang.org/grpc from 1.76.0 to 1.78.0#12739

Merged
kzys merged 2 commits intocontainerd:release/2.2from
ningmingxiao:update_grpc
Jan 7, 2026
Merged

[release/2.2] bump google.golang.org/grpc from 1.76.0 to 1.78.0#12739
kzys merged 2 commits intocontainerd:release/2.2from
ningmingxiao:update_grpc

Conversation

@ningmingxiao
Copy link
Contributor

@ningmingxiao ningmingxiao commented Jan 2, 2026

fix: #12738

@github-project-automation github-project-automation bot moved this to Needs Triage in Pull Request Review Jan 2, 2026
@dosubot dosubot bot added the dependencies Pull requests that update a dependency file label Jan 2, 2026
Copy link
Member

@djdongjin djdongjin left a comment

Choose a reason for hiding this comment

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

we can bump up to 1.78.0 directly?

@github-project-automation github-project-automation bot moved this from Needs Triage to Needs Update in Pull Request Review Jan 4, 2026
@ningmingxiao ningmingxiao changed the title build(deps): bump google.golang.org/grpc from 1.76.0 to 1.77.0 build(deps): bump google.golang.org/grpc from 1.76.0 to 1.78.0 Jan 5, 2026
@ningmingxiao
Copy link
Contributor Author

done @djdongjin

@akhilerm
Copy link
Member

akhilerm commented Jan 5, 2026

Can you do a cherry pick of #12530 and #12736. I think that should apply clean.

dependabot bot added 2 commits January 5, 2026 14:20
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.76.0 to 1.77.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](grpc/grpc-go@v1.76.0...v1.77.0)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-version: 1.77.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
(cherry picked from commit fb92a97)
Signed-off-by: ningmingxiao <[email protected]>
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.77.0 to 1.78.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](grpc/grpc-go@v1.77.0...v1.78.0)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-version: 1.78.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
(cherry picked from commit e7ba3c3)
Signed-off-by: ningmingxiao <[email protected]>
@ningmingxiao
Copy link
Contributor Author

done @akhilerm

@akhilerm
Copy link
Member

akhilerm commented Jan 5, 2026

done @akhilerm

Was this a clean cherry pick or some changes were made in the go.mod file? I see a difference in the patch id for the commits.

@ningmingxiao
Copy link
Contributor Author

ningmingxiao commented Jan 6, 2026

it's not a clean cherry pick, to fix conflict I add some change in go.mod. @akhilerm

@fuweid
Copy link
Member

fuweid commented Jan 7, 2026

is it possible to squash them into one commit? just upgrade from 1.76 to 1.78...

@ningmingxiao
Copy link
Contributor Author

ningmingxiao commented Jan 7, 2026

my second commit bfc4032 is one commit just upgrade from 1.76 to 1.78. but @akhilerm want to reserve cherry-pick message. do we really need cherry-pick message? @akhilerm

@akhilerm
Copy link
Member

akhilerm commented Jan 7, 2026

is it possible to squash them into one commit? just upgrade from 1.76 to 1.78...

@fuweid I wanted to have a trace of the original commits that were used for the update.

@dmcgowan dmcgowan changed the title build(deps): bump google.golang.org/grpc from 1.76.0 to 1.78.0 [release/2.2] bump google.golang.org/grpc from 1.76.0 to 1.78.0 Jan 7, 2026
@kzys kzys dismissed djdongjin’s stale review January 7, 2026 17:59

@ningmingxiao addressed the comment.

@kzys kzys merged commit 0778056 into containerd:release/2.2 Jan 7, 2026
52 checks passed
@github-project-automation github-project-automation bot moved this from Needs Update to Done in Pull Request Review Jan 7, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file size/XXL

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

6 participants