|
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
|
|
# Copyright 2015 gRPC authors.
|
|
|
|
|
#
|
|
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
|
# you may not use this file except in compliance with the License.
|
|
|
|
|
# You may obtain a copy of the License at
|
|
|
|
|
#
|
|
|
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
|
#
|
|
|
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
|
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
|
# See the License for the specific language governing permissions and
|
|
|
|
|
# limitations under the License.
|
|
|
|
|
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
export TEST=true
|
|
|
|
|
|
|
|
|
|
cd "$(dirname "$0")/../../.."
|
|
|
|
|
|
|
|
|
|
submodules=$(mktemp /tmp/submXXXXXX)
|
|
|
|
|
want_submodules=$(mktemp /tmp/submXXXXXX)
|
|
|
|
|
|
|
|
|
|
git submodule | awk '{ print $2 " " $1 }' | sort >"$submodules"
|
|
|
|
|
cat <<EOF | sort >"$want_submodules"
|
|
|
|
|
third_party/abseil-cpp b971ac5250ea8de900eae9f95e06548d14cd95fe
|
|
|
|
|
third_party/benchmark 361e8d1cfe0c6c36d30b39f1b61302ece5507320
|
|
|
|
|
third_party/bloaty 60209eb1ccc34d5deefb002d1b7f37545204f7f2
|
|
|
|
|
third_party/boringssl-with-bazel d473ae3587b9fa15f19f54da6243de3c53f67dfe
|
|
|
|
|
third_party/cares/cares 6654436a307a5a686b008c1d4c93b0085da6e6d8
|
|
|
|
|
third_party/envoy-api 68d4315167352ffac71f149a43b8088397d3f33d
|
|
|
|
|
third_party/googleapis 2f9af297c84c55c8b871ba4495e01ade42476c92
|
|
|
|
|
third_party/googletest 0e402173c97aea7a00749e825b194bfede4f2e45
|
|
|
|
|
third_party/libuv 02a9e1be252b623ee032a3137c0b0c94afbe6809
|
|
|
|
|
third_party/opencensus-proto 4aa53e15cbf1a47bc9087e6cfdca214c1eea4e89
|
|
|
|
|
third_party/opentelemetry 60fa8754d890b5c55949a8c68dcfd7ab5c2395df
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
third_party/protobuf 5ddb1fc609d2416e8575c9e7435c608222c2edb2
|
|
|
|
|
third_party/re2 0c5616df9c0aaa44c9440d87422012423d91c7d1
|
|
|
|
|
third_party/xds 32f1caf87195bf3390061c29f18987e51ca56a88
|
|
|
|
|
third_party/zlib 04f42ceca40f73e2978b50e93806c2a18c1281fc
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
diff -u "$submodules" "$want_submodules"
|
|
|
|
|
|
|
|
|
|
rm "$submodules" "$want_submodules"
|
