Skip to content

Commit d1fee05

Browse files
authored
Merge branch 'googleapis:main' into main
2 parents f5e1f8b + 2a00c76 commit d1fee05

File tree

152 files changed

+474
-630
lines changed

Some content is hidden

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

152 files changed

+474
-630
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

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`:

google/cloud/apigateway/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 apigateway-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 `apigateway_v1::ApiGatewayServiceClient`:

google/cloud/apigeeconnect/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 apigeeconnect-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 `apigeeconnect_v1::ConnectionServiceClient`:

0 commit comments

Comments
 (0)