Skip to content

Commit 43ed8e2

Browse files
coryancoryan
authored
chore: update googleapis SHA circa 2023-05-22 (googleapis#11696)
1 parent 80a8b19 commit 43ed8e2

61 files changed

Lines changed: 5698 additions & 221 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎bazel/google_cloud_cpp_deps.bzl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@ def google_cloud_cpp_deps(name = None):
9595
http_archive,
9696
name = "com_google_googleapis",
9797
urls = [
98-
"https://storage.googleapis.com/cloud-cpp-community-archive/com_google_googleapis/663480452442c468567a618b385db7c56c2dbec6.tar.gz",
99-
"https://github.com/googleapis/googleapis/archive/663480452442c468567a618b385db7c56c2dbec6.tar.gz",
98+
"https://storage.googleapis.com/cloud-cpp-community-archive/com_google_googleapis/117be9dfdf65ff766a794c8b85d5d7480a1fd83d.tar.gz",
99+
"https://github.com/googleapis/googleapis/archive/117be9dfdf65ff766a794c8b85d5d7480a1fd83d.tar.gz",
100100
],
101-
sha256 = "262f4284f8f3cc2b714219a263c718b65b2a35fd1839ba27c5adb6c5c2884827",
102-
strip_prefix = "googleapis-663480452442c468567a618b385db7c56c2dbec6",
101+
sha256 = "8d0476bf689d25c212744f38646d44a41ff36282722bb92160f536d9377aba3b",
102+
strip_prefix = "googleapis-117be9dfdf65ff766a794c8b85d5d7480a1fd83d",
103103
build_file = Label("//bazel:googleapis.BUILD"),
104104
# Scaffolding for patching googleapis after download. For example:
105105
# patches = ["googleapis.patch"]

‎ci/cloudbuild/builds/cmake-oldest-deps.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ vcpkg_root="$(vcpkg::root_dir)"
3030
cmake -GNinja -S . -B cmake-out/build \
3131
"-DCMAKE_TOOLCHAIN_FILE=${vcpkg_root}/scripts/buildsystems/vcpkg.cmake" \
3232
"-DVCPKG_MANIFEST_DIR=ci/etc/oldest-deps" \
33-
"-DVCPKG_FEATURE_FLAGS=versions,manifest"
33+
"-DVCPKG_FEATURE_FLAGS=versions,manifest" \
34+
"-DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_CORD_WORKAROUND=ON"
3435

3536
io::log_h2 "Building"
3637
cmake --build cmake-out/build

‎ci/cloudbuild/builds/m32.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ readonly ENABLED_FEATURES
3434
# This is the build to test with -m32, which requires a toolchain file.
3535
io::run cmake "${cmake_args[@]}" \
3636
"--toolchain" "${PROJECT_ROOT}/ci/etc/m32-toolchain.cmake" \
37-
-DGOOGLE_CLOUD_CPP_ENABLE="${ENABLED_FEATURES}"
37+
-DGOOGLE_CLOUD_CPP_ENABLE="${ENABLED_FEATURES}" \
38+
-DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_CORD_WORKAROUND=ON
3839
io::run cmake --build cmake-out
3940
mapfile -t ctest_args < <(ctest::common_args)
4041
io::run env -C cmake-out ctest "${ctest_args[@]}" -LE "integration-test"

‎ci/kokoro/macos/builds/cmake-vcpkg.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ cmake_flags=(
5959
"-DCMAKE_INSTALL_PREFIX=${HOME}/staging"
6060
"-DGOOGLE_CLOUD_CPP_ENABLE_CCACHE=ON"
6161
"-DGOOGLE_CLOUD_CPP_ENABLE_WERROR=ON"
62+
"-DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_CORD_WORKAROUND=ON"
6263
)
6364

6465
# The downloads can fail, therefore require a retry loop.

‎ci/kokoro/windows/builds/cmake.ps1‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ $cmake_args=@(
5454
"-DVCPKG_TARGET_TRIPLET=${env:VCPKG_TRIPLET}",
5555
"-DCMAKE_C_COMPILER=cl.exe",
5656
"-DCMAKE_CXX_COMPILER=cl.exe",
57-
"-DGOOGLE_CLOUD_CPP_ENABLE_WERROR=ON"
57+
"-DGOOGLE_CLOUD_CPP_ENABLE_WERROR=ON",
58+
"-DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_CORD_WORKAROUND=ON"
5859
)
5960

6061
# Configure CMake and create the build directory.

‎cmake/GoogleapisConfig.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ set(GOOGLE_CLOUD_CPP_GOOGLEAPIS_SHA256
2727
mark_as_advanced(GOOGLE_CLOUD_CPP_GOOGLEAPIS_SHA256)
2828

2929
set(_GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA
30-
"663480452442c468567a618b385db7c56c2dbec6")
30+
"117be9dfdf65ff766a794c8b85d5d7480a1fd83d")
3131
set(_GOOGLE_CLOUD_CPP_GOOGLEAPIS_SHA256
32-
"262f4284f8f3cc2b714219a263c718b65b2a35fd1839ba27c5adb6c5c2884827")
32+
"8d0476bf689d25c212744f38646d44a41ff36282722bb92160f536d9377aba3b")
3333

3434
set(DOXYGEN_ALIASES
3535
"googleapis_link{2}=\"[\\1](https://github.com/googleapis/googleapis/blob/${_GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}/\\2)\""

‎external/googleapis/protodeps/datamigration.deps‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,9 @@
44
@com_google_googleapis//google/api:http_proto
55
@com_google_googleapis//google/api:launch_stage_proto
66
@com_google_googleapis//google/api:resource_proto
7+
@com_google_googleapis//google/iam/v1:iam_policy_proto
8+
@com_google_googleapis//google/iam/v1:options_proto
9+
@com_google_googleapis//google/iam/v1:policy_proto
710
@com_google_googleapis//google/longrunning:operations_proto
811
@com_google_googleapis//google/rpc:status_proto
12+
@com_google_googleapis//google/type:expr_proto

‎external/googleapis/protodeps/webrisk.deps‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@
44
@com_google_googleapis//google/api:http_proto
55
@com_google_googleapis//google/api:launch_stage_proto
66
@com_google_googleapis//google/api:resource_proto
7+
@com_google_googleapis//google/longrunning:operations_proto
8+
@com_google_googleapis//google/rpc:status_proto

‎external/googleapis/protolists/datamigration.list‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
@com_google_googleapis//google/cloud/clouddms/logging/v1:clouddms_platform_logs.proto
22
@com_google_googleapis//google/cloud/clouddms/v1:clouddms.proto
33
@com_google_googleapis//google/cloud/clouddms/v1:clouddms_resources.proto
4+
@com_google_googleapis//google/cloud/clouddms/v1:conversionworkspace_resources.proto

‎external/googleapis/update_libraries.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,3 +295,9 @@ for library in "${keys[@]}"; do
295295
mv "${file}.sorted" "${file}"
296296
done
297297
done
298+
299+
# TODO(#11694) - the Bazel file introduces a dependency that we do not build.
300+
# Fortunately (maybe?) we do not use or need the dep until the issue is
301+
# resolved.
302+
sed -i '/@com_google_googleapis\/\/google\/cloud\/location:location_proto/d' \
303+
"external/googleapis/protodeps/datamigration.deps"

0 commit comments

Comments
 (0)