From 7d5ab5bb75dd72494f3f39a2b1753fb8d4d87efc Mon Sep 17 00:00:00 2001 From: Bani Singh Date: Sat, 19 Oct 2024 19:11:09 +0000 Subject: [PATCH] Update Protobuf to 28.2 Bug: b/372258572 Test: N/A Change-Id: I08ddb7c0aeff28a64d9c8ade751987436c125bc7 GitOrigin-RevId: ee4305bad48ac5f2d6042c6b642f7d59888ddf40 --- MODULE.bazel | 12 ++------ api/auth/auth.pb.go | 2 +- api/credshelper/credshelper.pb.go | 2 +- api/log/log.pb.go | 2 +- api/proxy/depscache.pb.go | 2 +- api/proxy/mismatch_ignore_rule.pb.go | 2 +- api/proxy/proxy.pb.go | 2 +- api/scandeps/cppscandeps.pb.go | 2 +- api/stat/stat.pb.go | 2 +- api/stats/stats.pb.go | 2 +- experiments/api/experiment/experiment.pb.go | 2 +- third_party/patches/protobuf/BUILD.bazel | 0 .../patches/protobuf/clang-cl-link-opts.patch | 28 ------------------- 13 files changed, 13 insertions(+), 47 deletions(-) delete mode 100644 third_party/patches/protobuf/BUILD.bazel delete mode 100644 third_party/patches/protobuf/clang-cl-link-opts.patch diff --git a/MODULE.bazel b/MODULE.bazel index 8c329055..1aaa67ef 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -49,19 +49,13 @@ use_repo(node, "nodejs", "nodejs_toolchains") # Protobuf and abseil are linked against by goma's input processor so we must keep the source versions in sync bazel_dep( name = "protobuf", - version = "26.0.bcr.1", # Same version as used in goma patch + version = "28.2", # Same version as used in goma fork repo_name = "com_google_protobuf", ) -single_version_override( - module_name = "protobuf", - patch_strip = 0, - patches = ["//third_party/patches/protobuf:clang-cl-link-opts.patch"], -) - bazel_dep(name = "abseil-cpp", repo_name = "com_google_absl") git_override( module_name = "abseil-cpp", - commit = "4a2c63365eff8823a5221db86ef490e828306f9d", # Same commit as in goma patch + commit = "4a2c63365eff8823a5221db86ef490e828306f9d", # Same commit as in goma fork remote = "https://github.com/abseil/abseil-cpp.git", ) @@ -72,7 +66,7 @@ bazel_dep(name = "googletest", version = "1.14.0.bcr.1", repo_name = "com_google gclient_repository = use_repo_rule("//:gclient.bzl", "gclient_repository") -GOMA_REV = "7ab631ba788178c65281ef46b3edce251c595f23" +GOMA_REV = "b2f15f7360d58a9fb881586fff3645ce154eb70b" gclient_repository( name = "goma", diff --git a/api/auth/auth.pb.go b/api/auth/auth.pb.go index 30dab0ef..65490429 100755 --- a/api/auth/auth.pb.go +++ b/api/auth/auth.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.35.1 -// protoc v5.26.0 +// protoc v5.28.2 // source: api/auth/auth.proto package auth diff --git a/api/credshelper/credshelper.pb.go b/api/credshelper/credshelper.pb.go index 6c122554..8045e26b 100755 --- a/api/credshelper/credshelper.pb.go +++ b/api/credshelper/credshelper.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.35.1 -// protoc v5.26.0 +// protoc v5.28.2 // source: api/credshelper/credshelper.proto package credshelper diff --git a/api/log/log.pb.go b/api/log/log.pb.go index 2a58a20e..c77011b5 100755 --- a/api/log/log.pb.go +++ b/api/log/log.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.35.1 -// protoc v5.26.0 +// protoc v5.28.2 // source: api/log/log.proto package log diff --git a/api/proxy/depscache.pb.go b/api/proxy/depscache.pb.go index 2a3361dd..86d5fa7c 100755 --- a/api/proxy/depscache.pb.go +++ b/api/proxy/depscache.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.35.1 -// protoc v5.26.0 +// protoc v5.28.2 // source: api/proxy/depscache.proto package proxy diff --git a/api/proxy/mismatch_ignore_rule.pb.go b/api/proxy/mismatch_ignore_rule.pb.go index 70024b42..18cd8c75 100755 --- a/api/proxy/mismatch_ignore_rule.pb.go +++ b/api/proxy/mismatch_ignore_rule.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.35.1 -// protoc v5.26.0 +// protoc v5.28.2 // source: api/proxy/mismatch_ignore_rule.proto package proxy diff --git a/api/proxy/proxy.pb.go b/api/proxy/proxy.pb.go index 48f93f72..0a7c8bcb 100755 --- a/api/proxy/proxy.pb.go +++ b/api/proxy/proxy.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.35.1 -// protoc v5.26.0 +// protoc v5.28.2 // source: api/proxy/proxy.proto package proxy diff --git a/api/scandeps/cppscandeps.pb.go b/api/scandeps/cppscandeps.pb.go index 932e8ec4..b2f3182a 100755 --- a/api/scandeps/cppscandeps.pb.go +++ b/api/scandeps/cppscandeps.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.35.1 -// protoc v5.26.0 +// protoc v5.28.2 // source: api/scandeps/cppscandeps.proto package scandeps diff --git a/api/stat/stat.pb.go b/api/stat/stat.pb.go index d7c18992..905dc2b2 100755 --- a/api/stat/stat.pb.go +++ b/api/stat/stat.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.35.1 -// protoc v5.26.0 +// protoc v5.28.2 // source: api/stat/stat.proto package stat diff --git a/api/stats/stats.pb.go b/api/stats/stats.pb.go index c7f92c5d..7d10f970 100755 --- a/api/stats/stats.pb.go +++ b/api/stats/stats.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.35.1 -// protoc v5.26.0 +// protoc v5.28.2 // source: api/stats/stats.proto package stats diff --git a/experiments/api/experiment/experiment.pb.go b/experiments/api/experiment/experiment.pb.go index d785aa86..4965b1a7 100755 --- a/experiments/api/experiment/experiment.pb.go +++ b/experiments/api/experiment/experiment.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.35.1 -// protoc v5.26.0 +// protoc v5.28.2 // source: experiments/api/experiment/experiment.proto package experiment diff --git a/third_party/patches/protobuf/BUILD.bazel b/third_party/patches/protobuf/BUILD.bazel deleted file mode 100644 index e69de29b..00000000 diff --git a/third_party/patches/protobuf/clang-cl-link-opts.patch b/third_party/patches/protobuf/clang-cl-link-opts.patch deleted file mode 100644 index 8ce31f35..00000000 --- a/third_party/patches/protobuf/clang-cl-link-opts.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- build_defs/BUILD.bazel 2024-03-12 11:01:14.000000000 +0000 -+++ build_defs/BUILD.bazel.new 2024-06-07 18:29:38.531498332 +0000 -@@ -14,10 +14,24 @@ - ) - - create_compiler_config_setting( -- name = "config_msvc", -+ name = "config_msvc_cl", - value = "msvc-cl", - ) - -+# Caveat: clang-cl support in protobuf is only best-effort / untested for now. -+create_compiler_config_setting( -+ name = "config_clang_cl", -+ value = "clang-cl", -+) -+ -+selects.config_setting_group( -+ name = "config_msvc", -+ match_any = [ -+ ":config_clang_cl", -+ ":config_msvc_cl", -+ ], -+) -+ - config_setting( - name = "aarch64", - values = {"cpu": "linux-aarch_64"},