From ded6470323d233ab6252962aea67059680ab7c92 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 24 Sep 2024 23:04:14 +0000 Subject: [PATCH] Update artifacts branch --- .source-revision | 2 +- third_party/protobuf | 2 +- third_party/protobuf.10007.patch | 30 ------------------------------ 3 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 third_party/protobuf.10007.patch diff --git a/.source-revision b/.source-revision index 8e44d2e8dbc..2bc7ba22049 100644 --- a/.source-revision +++ b/.source-revision @@ -1 +1 @@ -169ccf7a70f26d8647122a43a9cffb1ffdb4b4d5 +e4a422ba43c825d7adc289f40305dbe5eaf1fb79 diff --git a/third_party/protobuf b/third_party/protobuf index 63def39e881..10ef3f77683 160000 --- a/third_party/protobuf +++ b/third_party/protobuf @@ -1 +1 @@ -Subproject commit 63def39e881afa496502d9c410f4ea948e59490d +Subproject commit 10ef3f77683f77fb3c059bf47725c27b3ff41e63 diff --git a/third_party/protobuf.10007.patch b/third_party/protobuf.10007.patch deleted file mode 100644 index e64bd384ece..00000000000 --- a/third_party/protobuf.10007.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/build_defs/BUILD.bazel b/build_defs/BUILD.bazel -index 1c72eba68..176ab5a91 100644 ---- a/build_defs/BUILD.bazel -+++ b/build_defs/BUILD.bazel -@@ -14,10 +14,24 @@ package( - ) - - 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"},