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.

Sign up for GitHub

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

Jump to bottom

[backport to 1.2] Bump protoc #2561

Merged
merged 12 commits into from
Dec 6, 2024
Merged

[backport to 1.2] Bump protoc #2561

merged 12 commits into from
Dec 6, 2024

Conversation

Yury-Fridlyand
Copy link
Collaborator

@Yury-Fridlyand Yury-Fridlyand commented Oct 31, 2024 •
edited
Loading

Backport #2421 to 1.2
Depends on and includes #2782

Update protoc to most recent version.

Issue link

Closes #2650

Checklist

Before submitting the PR make sure the following are checked:

  • This Pull Request is related to one issue.
  • Commit message has a detailed description of what changed and why.
  • Tests are added or updated.
  • CHANGELOG.md and documentation files are updated.
  • Destination branch is correct - main or release
  • Commits will be squashed upon merging.

@Yury-Fridlyand
Bump protoc
b310b5f 
Signed-off-by: Yury-Fridlyand <[email protected]>
@Yury-Fridlyand Yury-Fridlyand added python Python wrapper java issues and fixes related to the java client protobuf labels Oct 31, 2024
@Yury-Fridlyand Yury-Fridlyand requested a review from a team as a code owner October 31, 2024 20:54
avifenesh
avifenesh reviewed Oct 31, 2024
View reviewed changes
python/requirements.txt Outdated Show resolved Hide resolved
@acarbonetto acarbonetto changed the title Bump protoc [backport to 1.2] Bump protoc Nov 1, 2024
@Yury-Fridlyand Yury-Fridlyand linked an issue Nov 15, 2024 that may be closed by this pull request
Bump protobuf and protoc versions #2650
Open
2 tasks
acarbonetto
acarbonetto reviewed Nov 20, 2024
View reviewed changes
Copy link
Collaborator

@acarbonetto acarbonetto 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 allow python users to use 3.25.5 as it addresses the vulnerability.
And java 28.2 is the version to use.

.github/workflows/pypi-cd.yml Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
.github/workflows/java-cd.yml Outdated Show resolved Hide resolved
.github/workflows/java-cd.yml Outdated Show resolved Hide resolved
.github/workflows/java.yml Outdated Show resolved Hide resolved
java/DEVELOPER.md Outdated Show resolved Hide resolved
java/DEVELOPER.md Outdated Show resolved Hide resolved
java/client/build.gradle Outdated Show resolved Hide resolved
python/DEVELOPER.md Outdated Show resolved Hide resolved
python/requirements.txt Outdated Show resolved Hide resolved
Yury-Fridlyand
Yury-Fridlyand commented Nov 21, 2024
View reviewed changes
.github/workflows/pypi-cd.yml Outdated Show resolved Hide resolved
java/DEVELOPER.md Outdated Show resolved Hide resolved
java/DEVELOPER.md Outdated Show resolved Hide resolved
python/DEVELOPER.md Outdated Show resolved Hide resolved
python/DEVELOPER.md Outdated Show resolved Hide resolved
Yury-Fridlyand and others added 4 commits November 20, 2024 17:12
@Yury-Fridlyand @acarbonetto
Apply suggestions from code review
7795c23 
Co-authored-by: Andrew Carbonetto <[email protected]>
Signed-off-by: Yury-Fridlyand <[email protected]>
@Yury-Fridlyand
revert python
a561315 
Signed-off-by: Yury-Fridlyand <[email protected]>
@Yury-Fridlyand
fix merge
99cbcc3 
Signed-off-by: Yury-Fridlyand <[email protected]>
@Yury-Fridlyand
fix merge
c8d155d 
Signed-off-by: Yury-Fridlyand <[email protected]>
@Yury-Fridlyand Yury-Fridlyand removed the python Python wrapper label Nov 21, 2024
@Yury-Fridlyand
Copy link
Collaborator Author

Yury-Fridlyand commented Nov 21, 2024 •
edited
Loading

I reverted all changes for python 🐍

@avifenesh avifenesh added dependency Dependency management and removed protobuf labels Nov 21, 2024
@Yury-Fridlyand Yury-Fridlyand merged commit c99f30b into valkey-io:release-1.2 Dec 6, 2024
16 checks passed
@Yury-Fridlyand Yury-Fridlyand deleted the protoc-update branch December 6, 2024 18:48
Yury-Fridlyand added a commit to Bit-Quill/valkey-glide that referenced this pull request Dec 10, 2024
@Yury-Fridlyand @acarbonetto
[backport to 1.2] Bump protoc (valkey-io#2561)
49c832d 
* Bump protoc

Signed-off-by: Yury-Fridlyand <[email protected]>
Co-authored-by: Andrew Carbonetto <[email protected]>
@Yury-Fridlyand Yury-Fridlyand mentioned this pull request Dec 10, 2024
Merged
yipin-chen pushed a commit that referenced this pull request Dec 10, 2024
@Yury-Fridlyand @acarbonetto
[Backport to main] Bump protoc (#2561) (#2796)
342df51 
[backport to 1.2] Bump protoc (#2561)

* Bump protoc

Signed-off-by: Yury-Fridlyand <[email protected]>
Co-authored-by: Andrew Carbonetto <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@acarbonetto acarbonetto acarbonetto left review comments

@avifenesh avifenesh avifenesh left review comments

@prateek-kumar-improving prateek-kumar-improving prateek-kumar-improving approved these changes

@yipin-chen yipin-chen yipin-chen approved these changes

Assignees
No one assigned
Labels
1_2_1_candidate dependency Dependency management java issues and fixes related to the java client
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Bump protobuf and protoc versions
5 participants
@Yury-Fridlyand @avifenesh @acarbonetto @yipin-chen @prateek-kumar-improving