Skip to content

Commit 0bb5a12

Browse files
mpeddada1mpeddada1
committed
rebase with main
2 parents a29f415 + 4ea3d12 commit 0bb5a12

File tree

171 files changed

+1306
-733
lines changed

Some content is hidden

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

171 files changed

+1306
-733
lines changed

‎.github/workflows/test-runner.yml‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,8 @@ jobs:
7777
# the additional jobs inherit any secrets needed to use the remote caches and
7878
# receive what version to checkout as an input.
7979
macos-bazel:
80-
# Build the full matrix only on push events to the default branch, or
81-
# when PR gets the has a `gha:full-build` label, or when it had the
82-
# label already and it gets a new commit.
83-
if: |-
84-
${{
85-
github.event_name == 'schedule' ||
86-
github.event_name == 'push' ||
87-
contains(github.event.pull_request.labels.*.name, 'gha:full-build')
88-
}}
80+
# Disabled
81+
if: false
8982
name: macOS-Bazel
9083
needs: [pre-flight]
9184
uses: ./.github/workflows/macos-bazel.yml
@@ -156,7 +149,7 @@ jobs:
156149
name: Notify-Google-Chat
157150
# Wait until all the other jobs have completed.
158151
needs:
159-
- macos-bazel
152+
# macos-bazel is disabled
160153
# macos-cmake is disabled
161154
- windows-bazel
162155
- windows-cmake

‎.github/workflows/windows-cmake.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ jobs:
8585
shell: bash
8686
run: |
8787
echo "vcpkg-version=$(cat ci/etc/vcpkg-version.txt)" >> "${GITHUB_OUTPUT}"
88-
core1_features=(bigtable)
89-
core2_features=(spanner)
90-
core3_features=(storage)
91-
core4_features=(storage_grpc)
92-
core5_features=(pubsub pubsublite)
88+
core1_features=(bigtable universe_domain)
89+
core2_features=(spanner universe_domain)
90+
core3_features=(storage universe_domain)
91+
core4_features=(storage_grpc universe_domain)
92+
core5_features=(pubsub pubsublite universe_domain)
9393
# These are the libraries with the most "clients". To build the list
9494
# run something like this and create shards:
9595
#
@@ -107,6 +107,7 @@ jobs:
107107
sql
108108
dialogflow_cx
109109
dialogflow_es
110+
universe_domain
110111
)
111112
shard2_features=(
112113
beyondcorp
@@ -119,6 +120,7 @@ jobs:
119120
servicecontrol
120121
speech
121122
support
123+
universe_domain
122124
)
123125
shard3_features=(
124126
securesourcemanager
@@ -164,6 +166,7 @@ jobs:
164166
trace
165167
vision
166168
workflows
169+
universe_domain
167170
)
168171
shard4_features=(
169172
accessapproval
@@ -203,6 +206,7 @@ jobs:
203206
gkebackup
204207
gkeconnect
205208
gkehub
209+
universe_domain
206210
)
207211
shard5_features=(
208212
video
@@ -216,6 +220,7 @@ jobs:
216220
bigquery
217221
bigquerycontrol
218222
resourcemanager
223+
universe_domain
219224
)
220225
if [[ "${{ matrix.shard }}" == "Core1" ]]; then
221226
features="$(printf ",%s" "${core1_features[@]}")"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ cmake_flags=(
8181
"-DGOOGLE_CLOUD_CPP_ENABLE_CCACHE=ON"
8282
"-DGOOGLE_CLOUD_CPP_ENABLE_WERROR=ON"
8383
"-DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_CORD_WORKAROUND=ON"
84+
"-DGOOGLE_CLOUD_CPP_ENABLE=universe_domain"
8485
)
8586

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

‎generator/integration_tests/golden/doc/override-universe-domain.dox‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
/*!
22
@page golden-override-universe-domain How to Override the Default Universe Domain
33

4-
In some cases, you may need to override the default universe domain used by the client
5-
library. Use the
6-
[AddUniverseDomainOption](@ref google::cloud::AddUniverseDomainOption) when initializing the
7-
client library to change this default.
4+
In some cases, you may need to override the default universe domain used by the
5+
client library. Use the `google::cloud::AddUniverseDomainOption` when
6+
initializing the client library to change this default.
87

98
<!-- inject-universe-domain-snippet-start -->
109
<!-- inject-universe-domain-snippet-end -->

‎generator/internal/scaffold_generator.cc‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -680,10 +680,9 @@ void GenerateOverrideUniverseDomainPage(
680680
auto constexpr kText = R"""(/*!
681681
@page $library$-override-universe-domain How to Override the Default Universe Domain
682682
683-
In some cases, you may need to override the default universe domain used by the client
684-
library. Use the
685-
[AddUniverseDomainOption](@ref google::cloud::AddUniverseDomainOption) when initializing the
686-
client library to change this default.
683+
In some cases, you may need to override the default universe domain used by the
684+
client library. Use the `google::cloud::AddUniverseDomainOption` when
685+
initializing the client library to change this default.
687686
688687
<!-- inject-universe-domain-snippet-start -->
689688
<!-- inject-universe-domain-snippet-end -->

‎google/cloud/accessapproval/doc/override-universe-domain.dox‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
/*!
22
@page accessapproval-override-universe-domain How to Override the Default Universe Domain
33

4-
In some cases, you may need to override the default universe domain used by the client
5-
library. Use the
6-
[AddUniverseDomainOption](@ref google::cloud::AddUniverseDomainOption) when initializing the
7-
client library to change this default.
4+
In some cases, you may need to override the default universe domain used by the
5+
client library. Use the `google::cloud::AddUniverseDomainOption` when
6+
initializing the client library to change this default.
87

98
<!-- inject-universe-domain-snippet-start -->
109
For example, this will override the default universe domain for `accessapproval_v1::AccessApprovalClient`:

‎google/cloud/accesscontextmanager/doc/override-universe-domain.dox‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
/*!
22
@page accesscontextmanager-override-universe-domain How to Override the Default Universe Domain
33

4-
In some cases, you may need to override the default universe domain used by the client
5-
library. Use the
6-
[AddUniverseDomainOption](@ref google::cloud::AddUniverseDomainOption) when initializing the
7-
client library to change this default.
4+
In some cases, you may need to override the default universe domain used by the
5+
client library. Use the `google::cloud::AddUniverseDomainOption` when
6+
initializing the client library to change this default.
87

98
<!-- inject-universe-domain-snippet-start -->
109
For example, this will override the default universe domain for `accesscontextmanager_v1::AccessContextManagerClient`:

‎google/cloud/advisorynotifications/doc/override-universe-domain.dox‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
/*!
22
@page advisorynotifications-override-universe-domain How to Override the Default Universe Domain
33

4-
In some cases, you may need to override the default universe domain used by the client
5-
library. Use the
6-
[AddUniverseDomainOption](@ref google::cloud::AddUniverseDomainOption) when initializing the
7-
client library to change this default.
4+
In some cases, you may need to override the default universe domain used by the
5+
client library. Use the `google::cloud::AddUniverseDomainOption` when
6+
initializing the client library to change this default.
87

98
<!-- inject-universe-domain-snippet-start -->
109
For example, this will override the default universe domain for `advisorynotifications_v1::AdvisoryNotificationsServiceClient`:

‎google/cloud/aiplatform/doc/override-universe-domain.dox‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
/*!
22
@page aiplatform-override-universe-domain How to Override the Default Universe Domain
33

4-
In some cases, you may need to override the default universe domain used by the client
5-
library. Use the
6-
[AddUniverseDomainOption](@ref google::cloud::AddUniverseDomainOption) when initializing the
7-
client library to change this default.
4+
In some cases, you may need to override the default universe domain used by the
5+
client library. Use the `google::cloud::AddUniverseDomainOption` when
6+
initializing the client library to change this default.
87

98
<!-- inject-universe-domain-snippet-start -->
109
For example, this will override the default universe domain for `aiplatform_v1::DatasetServiceClient`:

‎google/cloud/alloydb/doc/override-universe-domain.dox‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
/*!
22
@page alloydb-override-universe-domain How to Override the Default Universe Domain
33

4-
In some cases, you may need to override the default universe domain used by the client
5-
library. Use the
6-
[AddUniverseDomainOption](@ref google::cloud::AddUniverseDomainOption) when initializing the
7-
client library to change this default.
4+
In some cases, you may need to override the default universe domain used by the
5+
client library. Use the `google::cloud::AddUniverseDomainOption` when
6+
initializing the client library to change this default.
87

98
<!-- inject-universe-domain-snippet-start -->
109
For example, this will override the default universe domain for `alloydb_v1::AlloyDBAdminClient`:

0 commit comments

Comments
 (0)