Skip to content

Commit 312a93e

Browse files
authored
Merge branch 'main' into patch-1
2 parents a23f19c + ea33e14 commit 312a93e

File tree

67 files changed

+4462
-5
lines changed

Some content is hidden

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

67 files changed

+4462
-5
lines changed

.github/workflows/windows-cmake.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
msvc: [ msvc-2022 ]
4242
build_type: [ Debug, Release ]
4343
arch: [ x64, x86 ]
44-
shard: [Core1, Core2, Core3, Core4, Compute, AIPlatform, Shard1, Shard2, Shard3, Shard4, Other]
44+
shard: [Core1, Core2, Core3, Core4, Core5, Compute, AIPlatform, Shard1, Shard2, Shard3, Shard4, Other]
4545
exclude:
4646
# Also skip shards (Compute and Other) that contain only generated code.
4747
- exclude-from-full-trick: ${{ ! inputs.full-matrix }}
@@ -61,6 +61,9 @@ jobs:
6161
# No need to duplicate testing with x86 mode and Debug mode
6262
- arch: x86
6363
build_type: Debug
64+
# TODO(#15070): Undo exclusion of the shard if we can reduce PDB size.
65+
- shard: Core4
66+
build_type: Debug
6467
steps:
6568
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
6669
with:
@@ -82,10 +85,11 @@ jobs:
8285
shell: bash
8386
run: |
8487
echo "vcpkg-version=$(cat ci/etc/vcpkg-version.txt)" >> "${GITHUB_OUTPUT}"
85-
core1_features=(bigtable pubsub pubsublite)
88+
core1_features=(bigtable)
8689
core2_features=(spanner)
8790
core3_features=(storage)
8891
core4_features=(storage_grpc)
92+
core5_features=(pubsub pubsublite)
8993
# These are the libraries with the most "clients". To build the list
9094
# run something like this and create shards:
9195
#
@@ -223,6 +227,9 @@ jobs:
223227
elif [[ "${{ matrix.shard }}" == "Core4" ]]; then
224228
features="$(printf ",%s" "${core4_features[@]}")"
225229
echo "features=${features:1}" >> "${GITHUB_OUTPUT}"
230+
elif [[ "${{ matrix.shard }}" == "Core5" ]]; then
231+
features="$(printf ",%s" "${core5_features[@]}")"
232+
echo "features=${features:1}" >> "${GITHUB_OUTPUT}"
226233
elif [[ "${{matrix.shard}}" == "Compute" ]]; then
227234
echo "features=compute" >> "${GITHUB_OUTPUT}"
228235
elif [[ "${{matrix.shard}}" == "AIPlatform" ]]; then
@@ -244,6 +251,7 @@ jobs:
244251
skipped_features+=("${core2_features[@]}")
245252
skipped_features+=("${core3_features[@]}")
246253
skipped_features+=("${core4_features[@]}")
254+
skipped_features+=("${core5_features[@]}")
247255
skipped_features+=(compute)
248256
skipped_features+=(aiplatform)
249257
skipped_features+=("${shard1_features[@]}")

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ the APIs in these libraries are stable, and are ready for production use.
1313

1414
- [Financial Services API](/google/cloud/financialservices/README.md)
1515
- [Storage Batch Operations API](/google/cloud/storagebatchoperations/README.md)
16+
- [Device Streaming API](/google/cloud/devicestreaming/README.md)
1617

1718
### Updated Libraries
1819

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,9 @@ See each library's `README.md` file for more information about:
224224
- [Developer Connect API](google/cloud/developerconnect/README.md)
225225
[[quickstart]](google/cloud/developerconnect/quickstart/README.md)
226226
[[reference]](https://cloud.google.com/cpp/docs/reference/developerconnect/latest)
227+
- [Device Streaming API](google/cloud/devicestreaming/README.md)
228+
[[quickstart]](google/cloud/devicestreaming/quickstart/README.md)
229+
[[reference]](https://cloud.google.com/cpp/docs/reference/devicestreaming/latest)
227230
- [Dialogflow CX API](google/cloud/dialogflow_cx/README.md)
228231
[[quickstart]](google/cloud/dialogflow_cx/quickstart/README.md)
229232
[[reference]](https://cloud.google.com/cpp/docs/reference/dialogflow_cx/latest)
Binary file not shown.

ci/cloudbuild/builds/lib/integration.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,21 @@ function integration::bazel_args() {
132132
"--test_env=GOOGLE_CLOUD_CPP_STORAGE_TEST_KEY_FILE_P12=${KEY_DIR}/${key_base}.p12"
133133
)
134134
fi
135+
136+
# Adds environment variables for SSL testing.
137+
# Info on how to create/refresh these can be found at:
138+
# https://cloud.google.com/certificate-authority-service/docs/create-certificate
139+
gcloud storage cp --quiet "${SECRETS_BUCKET}/client.crt" "${KEY_DIR}/client.crt" >/dev/null 2>&1 || true
140+
gcloud storage cp --quiet "${SECRETS_BUCKET}/client.chain.crt" "${KEY_DIR}/client.chain.crt" >/dev/null 2>&1 || true
141+
gcloud storage cp --quiet "${SECRETS_BUCKET}/client.private.pem" "${KEY_DIR}/client.private.pem" >/dev/null 2>&1 || true
142+
if [[ -r "${KEY_DIR}/client.crt" ]] && [[ -r "${KEY_DIR}/client.chain.crt" ]] && [[ -r "${KEY_DIR}/client.private.pem" ]]; then
143+
args+=(
144+
"--test_env=GOOGLE_CLOUD_CPP_CLIENT_SSL_CERT_FILE=${KEY_DIR}/client.crt"
145+
"--test_env=GOOGLE_CLOUD_CPP_CLIENT_SSL_CERT_CHAIN_FILE=${KEY_DIR}/client.chain.crt"
146+
"--test_env=GOOGLE_CLOUD_CPP_CLIENT_SSL_KEY_FILE=${KEY_DIR}/client.private.pem"
147+
)
148+
fi
149+
135150
printf "%s\n" "${args[@]}"
136151
}
137152

ci/etc/expected_install_directories

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -698,6 +698,10 @@
698698
./include/google/cloud/developerconnect/v1
699699
./include/google/cloud/developerconnect/v1/internal
700700
./include/google/cloud/developerconnect/v1/mocks
701+
./include/google/cloud/devicestreaming
702+
./include/google/cloud/devicestreaming/v1
703+
./include/google/cloud/devicestreaming/v1/internal
704+
./include/google/cloud/devicestreaming/v1/mocks
701705
./include/google/cloud/dialogflow
702706
./include/google/cloud/dialogflow/cx
703707
./include/google/cloud/dialogflow/cx/v3
@@ -1372,6 +1376,8 @@
13721376
./lib64/cmake/google_cloud_cpp_deploy_mocks
13731377
./lib64/cmake/google_cloud_cpp_developerconnect
13741378
./lib64/cmake/google_cloud_cpp_developerconnect_mocks
1379+
./lib64/cmake/google_cloud_cpp_devicestreaming
1380+
./lib64/cmake/google_cloud_cpp_devicestreaming_mocks
13751381
./lib64/cmake/google_cloud_cpp_dialogflow_cx
13761382
./lib64/cmake/google_cloud_cpp_dialogflow_cx_mocks
13771383
./lib64/cmake/google_cloud_cpp_dialogflow_es

cmake/GoogleCloudCppFeatures.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ set(GOOGLE_CLOUD_CPP_GA_LIBRARIES
8888
"datastream"
8989
"deploy"
9090
"developerconnect"
91+
"devicestreaming"
9192
"dialogflow_cx"
9293
"dialogflow_es"
9394
"discoveryengine"
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
@com_google_googleapis//google/api:annotations_proto
2+
@com_google_googleapis//google/api:client_proto
3+
@com_google_googleapis//google/api:field_behavior_proto
4+
@com_google_googleapis//google/api:http_proto
5+
@com_google_googleapis//google/api:launch_stage_proto
6+
@com_google_googleapis//google/api:resource_proto
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@com_google_googleapis//google/cloud/devicestreaming/v1:adb_service.proto
2+
@com_google_googleapis//google/cloud/devicestreaming/v1:service.proto

external/googleapis/update_libraries.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ declare -A -r LIBRARIES=(
129129
["datastream"]="@com_google_googleapis//google/cloud/datastream/v1:datastream_cc_grpc"
130130
["deploy"]="@com_google_googleapis//google/cloud/deploy/v1:deploy_cc_grpc"
131131
["developerconnect"]="@com_google_googleapis//google/cloud/developerconnect/v1:developerconnect_cc_grpc"
132+
["devicestreaming"]="@com_google_googleapis//google/cloud/devicestreaming/v1:devicestreaming_cc_grpc"
132133
["dialogflow_es"]="@com_google_googleapis//google/cloud/dialogflow/v2:dialogflow_cc_grpc"
133134
["dialogflow_cx"]="@com_google_googleapis//google/cloud/dialogflow/cx/v3:cx_cc_grpc"
134135
["discoveryengine"]="@com_google_googleapis//google/cloud/discoveryengine/v1:discoveryengine_cc_grpc"

0 commit comments

Comments
 (0)