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

[grpc] Update to 1.46.3 #25071

Merged
merged 13 commits into from
Jul 14, 2022
Merged

[grpc] Update to 1.46.3 #25071

merged 13 commits into from
Jul 14, 2022

Conversation

Tradias
Copy link
Contributor

@Tradias Tradias commented Jun 4, 2022

  • What does your PR fix?

    Fixes [grpc] update to 1.46.0 #24557

  • Which triplets are supported/not supported? Have you updated the CI baseline?

    yes

  • Does your PR follow the maintainer guide?

    yes

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

    yes

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

You have modified or added at least one vcpkg.json where you should check the license field.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/upb/vcpkg.json

Valid values for the license field can be found in the documentation

…otobuf_generate. Also add license to vcpkg.json
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for abseil have changed but the version was not updated
version: 20211102.1#1
old SHA: a155a4bc47fd9a3704b260f51d963a02f2b82615
new SHA: 84c9cd0c9b454866343894662c7d09b72f78e413
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

Use the version scheme "version" instead of "version-string" in port "abseil".

You have modified or added at least one vcpkg.json where you should check the license field.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/abseil/vcpkg.json

Valid values for the license field can be found in the documentation

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for grpc have changed but the version was not updated
version: 1.46.3
old SHA: 7bfd4a77e06252446c0da5534ec5302dca6b8be5
new SHA: 8410a2c3a3898c29b286a6bfe4a7e3d638bf661f
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

@FrankXie05 FrankXie05 self-assigned this Jun 6, 2022
@FrankXie05 FrankXie05 added the category:port-update The issue is with a library, which is requesting update new revision label Jun 6, 2022
…ted descriptor.upb.h files just to use them when compiling target triplet
@Tradias
Copy link
Contributor Author

Tradias commented Jun 6, 2022

I think the arm64_windows pipeline had a bit of a hiccup, otherwise the pull request should be ready.

@Tradias Tradias marked this pull request as ready for review June 6, 2022 08:41
@FrankXie05
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

ports/upb/0001-make-cmakelists-py.patch Outdated Show resolved Hide resolved
ports/upb/portfile.cmake Show resolved Hide resolved
ports/upb/upb-config-vcpkg-tools.cmake Show resolved Hide resolved
ports/grpc/portfile.cmake Show resolved Hide resolved
ports/grpc/00009-use-system-upb.patch Show resolved Hide resolved
ports/grpc/00009-use-system-upb.patch Outdated Show resolved Hide resolved
ports/upb/0001-make-cmakelists-py.patch Show resolved Hide resolved
github-actions[bot]
github-actions bot previously approved these changes Jun 9, 2022
@FrankXie05 FrankXie05 added depends:upstream-changes Waiting on a change to the upstream project and removed requires:author-response labels Jun 10, 2022
@FAKERINHEART
Copy link

Hi, when could this port request be merged into master?

@JackBoosY
Copy link
Contributor

@FAKERINHEART Waiting for upstream response in protocolbuffers/protobuf#13755

@JackBoosY
Copy link
Contributor

I will continue to review this PR tomorrow since it's too huge.

ports/grpc/00009-use-system-upb.patch Show resolved Hide resolved
ports/grpc/00014-pkgconfig-upbdefs.patch Outdated Show resolved Hide resolved
ports/grpc/vcpkg.json Outdated Show resolved Hide resolved
@JackBoosY
Copy link
Contributor

@JackBoosY Since upstream hasn't answered yet, I have another idea. Instead of adding all the logic for upb's protoc plugins I can add the generated source files directly (descriptor.upb.h, descriptor.upb.c and so on). Then upstream can decide what to do about the protoc plugins eventually and how to add them to the CMakeLists generator.

I think that has some risk.

@Tradias
Copy link
Contributor Author

Tradias commented Jul 4, 2022

@FAKERINHEART Regarding gRPC 1.47.x: I would recommend to add 1.46.3 first and then immediately create another pr to add 1.47.x because 1.46 is the last version to support C++11 and will receive critical patches until 2023-06-01. I therefore think that it would be beneficial to have version 1.46 here in vcpkg so that people can use it in a version override if needed.

@FAKERINHEART
Copy link

@Tradias It sounds great!

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for upb have changed but the version was not updated
version: 2022-04-04
old SHA: b5d5c869f37a3090c70ad85182185efacf97bbf7
new SHA: de1d8718e4ea42428b87f4275352c4f3bbb6ac11
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***
error: checked-in files for grpc have changed but the version was not updated
version: 1.46.3
old SHA: 1c6ae19974f859d5032d9f75b47be347bf4aaab0
new SHA: e3c2bbbb21b4605189be3118a13bbd84375fbebb
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for upb have changed but the version was not updated
version: 2022-04-04
old SHA: b5d5c869f37a3090c70ad85182185efacf97bbf7
new SHA: de1d8718e4ea42428b87f4275352c4f3bbb6ac11
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

github-actions[bot]
github-actions bot previously approved these changes Jul 6, 2022
@JackBoosY JackBoosY removed depends:upstream-changes Waiting on a change to the upstream project requires:author-response labels Jul 13, 2022
brendanburkhart added a commit to JHU-Delivery-Robot/Navigation that referenced this pull request Jul 13, 2022
Waiting on vcpkg to update gRPC tp 1.46, see
microsoft/vcpkg#25071
brendanburkhart added a commit to JHU-Delivery-Robot/Navigation that referenced this pull request Jul 13, 2022
Waiting on vcpkg to update gRPC to v1.46, see
microsoft/vcpkg#25071
@FrankXie05
Copy link
Contributor

All features are tested successfully in the following triplet:

  • x86-windows
  • x64-windows
  • x64-windows-stataic

@FrankXie05 FrankXie05 added the info:reviewed Pull Request changes follow basic guidelines label Jul 14, 2022
@vicroms vicroms merged commit 0cb8191 into microsoft:master Jul 14, 2022
brendanburkhart added a commit to JHU-Delivery-Robot/Navigation that referenced this pull request Jul 16, 2022
Waiting on vcpkg to update gRPC to v1.46, see
microsoft/vcpkg#25071
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[grpc] update to 1.46.0
5 participants