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

Update protobuf from 3.22.3 to 3.25.4 #15684

Merged
merged 4 commits into from
Sep 8, 2024

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented Sep 4, 2024

Description

Updates version of protobuf in buildSrc/version.properties from 3.22.3 to 3.25.4

Check List

  • Functionality includes testing.
  • API changes companion pull request created, if applicable.
  • Public documentation issue/PR created, if applicable.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Copy link
Contributor

github-actions bot commented Sep 4, 2024

❌ Gradle check result for 8774724: null

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

github-actions bot commented Sep 4, 2024

❌ Gradle check result for 20813bc: null

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Copy link
Contributor

github-actions bot commented Sep 4, 2024

❌ Gradle check result for cf459f0: null

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

1 similar comment
Copy link
Contributor

github-actions bot commented Sep 4, 2024

❌ Gradle check result for cf459f0: null

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

github-actions bot commented Sep 4, 2024

✅ Gradle check result for cf459f0: SUCCESS

Copy link

codecov bot commented Sep 4, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.97%. Comparing base (375dda3) to head (7e640ae).
Report is 12 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff            @@
##               main   #15684   +/-   ##
=========================================
  Coverage     71.96%   71.97%           
- Complexity    64195    64224   +29     
=========================================
  Files          5271     5271           
  Lines        300180   300180           
  Branches      43381    43381           
=========================================
+ Hits         216016   216042   +26     
+ Misses        66444    66351   -93     
- Partials      17720    17787   +67     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
Copy link
Member Author

cwperks commented Sep 5, 2024

Resolved conflicts in CHANGELOG.md

Copy link
Contributor

github-actions bot commented Sep 5, 2024

❕ Gradle check result for 7e640ae: UNSTABLE

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

@reta
Copy link
Collaborator

reta commented Sep 8, 2024

Thanks a lot @cwperks !

@reta reta added dependencies Pull requests that update a dependency file backport 2.x Backport to 2.x branch labels Sep 8, 2024
@reta reta merged commit 5642ce7 into opensearch-project:main Sep 8, 2024
40 of 42 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-15684-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5642ce7b4a432e25e6d71ceab961165bcd7eaad4
# Push it to GitHub
git push --set-upstream origin backport/backport-15684-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-15684-to-2.x.

@reta
Copy link
Collaborator

reta commented Sep 8, 2024

@cwperks could you please backport to 2.x? thank you!

cwperks added a commit to cwperks/OpenSearch that referenced this pull request Sep 9, 2024
* Update protobuf from 3.22.3 to 3.25.4

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add CHANGELOG entry

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove double hyphen

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
(cherry picked from commit 5642ce7)
@cwperks
Copy link
Member Author

cwperks commented Sep 9, 2024

Opened a backport here: #15864

reta pushed a commit that referenced this pull request Sep 9, 2024
* Update protobuf from 3.22.3 to 3.25.4 (#15684)

* Update protobuf from 3.22.3 to 3.25.4

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add CHANGELOG entry

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove double hyphen

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
(cherry picked from commit 5642ce7)

* Update repository-gcs/build.gradlee

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
akolarkunnu pushed a commit to akolarkunnu/OpenSearch that referenced this pull request Sep 10, 2024
* Update protobuf from 3.22.3 to 3.25.4

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add CHANGELOG entry

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove double hyphen

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
dk2k pushed a commit to dk2k/OpenSearch that referenced this pull request Oct 16, 2024
* Update protobuf from 3.22.3 to 3.25.4

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add CHANGELOG entry

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove double hyphen

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
dk2k pushed a commit to dk2k/OpenSearch that referenced this pull request Oct 17, 2024
* Update protobuf from 3.22.3 to 3.25.4

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add CHANGELOG entry

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove double hyphen

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
dk2k pushed a commit to dk2k/OpenSearch that referenced this pull request Oct 21, 2024
* Update protobuf from 3.22.3 to 3.25.4

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add CHANGELOG entry

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove double hyphen

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch backport-failed dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants