Skip to content

Commit e2e1643

Browse files
committed
Merge branch 'main' into spanner-non-blocking-ddl
2 parents 5752bb3 + bf5192c commit e2e1643

File tree

854 files changed

+256818
-75529
lines changed

Some content is hidden

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

854 files changed

+256818
-75529
lines changed

.github/renovate.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@
147147
"apis/Google.Cloud.GkeHub.V1/Google.Cloud.GkeHub.V1/**",
148148
"apis/Google.Cloud.GkeMultiCloud.V1/Google.Cloud.GkeMultiCloud.V1/**",
149149
"apis/Google.Cloud.GkeRecommender.V1/Google.Cloud.GkeRecommender.V1/**",
150+
"apis/Google.Cloud.HypercomputeCluster.V1Beta/Google.Cloud.HypercomputeCluster.V1Beta/**",
150151
"apis/Google.Cloud.Iam.Admin.V1/Google.Cloud.Iam.Admin.V1/**",
151152
"apis/Google.Cloud.Iam.Credentials.V1/Google.Cloud.Iam.Credentials.V1/**",
152153
"apis/Google.Cloud.Iam.V1/Google.Cloud.Iam.V1/**",
@@ -169,6 +170,7 @@
169170
"apis/Google.Cloud.Logging.Type/Google.Cloud.Logging.Type/**",
170171
"apis/Google.Cloud.Logging.V2/Google.Cloud.Logging.V2/**",
171172
"apis/Google.Cloud.Lustre.V1/Google.Cloud.Lustre.V1/**",
173+
"apis/Google.Cloud.Maintenance.Api.V1/Google.Cloud.Maintenance.Api.V1/**",
172174
"apis/Google.Cloud.Maintenance.Api.V1Beta/Google.Cloud.Maintenance.Api.V1Beta/**",
173175
"apis/Google.Cloud.ManagedIdentities.V1/Google.Cloud.ManagedIdentities.V1/**",
174176
"apis/Google.Cloud.ManagedKafka.V1/Google.Cloud.ManagedKafka.V1/**",

.github/workflows/bigtable-conformance.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
conformance:
2626
runs-on: ubuntu-latest
2727
steps:
28-
- uses: actions/checkout@v5
28+
- uses: actions/checkout@v6
2929
with:
3030
submodules: true
31-
- uses: actions/checkout@v5
31+
- uses: actions/checkout@v6
3232
with:
3333
repository: googleapis/cloud-bigtable-clients-test
3434
ref: main

.github/workflows/build-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
regex: ["'Google\\.Cloud\\.[A-L].*'", "'Google\\.Cloud\\.[M-Z].*'", "'!Google\\.Cloud'"]
1414

1515
steps:
16-
- uses: actions/checkout@v5
16+
- uses: actions/checkout@v6
1717
with:
1818
submodules: true
1919
fetch-depth: 100

.github/workflows/build-push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
DOTNET_NOLOGO: true
1414

1515
steps:
16-
- uses: actions/checkout@v5
16+
- uses: actions/checkout@v6
1717
with:
1818
submodules: true
1919

.github/workflows/check-api-catalog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99

1010
steps:
11-
- uses: actions/checkout@v5
11+
- uses: actions/checkout@v6
1212

1313
- name: Validate API catalog
1414
run: python -c 'import json; json.load(open("generator-input/apis.json", "r"))'

.github/workflows/check-script-permissions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99

1010
steps:
11-
- uses: actions/checkout@v5
11+
- uses: actions/checkout@v6
1212

1313
- name: Validate script permissions
1414
run: '! stat -c "%a %n" generator-input/tweaks/*/p*.sh | grep -v 755'

.github/workflows/diff-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
pull-requests: write
1515

1616
steps:
17-
- uses: actions/checkout@v5
17+
- uses: actions/checkout@v6
1818
with:
1919
submodules: true
2020
fetch-depth: 100

.github/workflows/spanner-emulator-pr-push.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ jobs:
1717
DOTNET_NOLOGO: true
1818
services:
1919
emulator:
20-
image: gcr.io/cloud-spanner-emulator/emulator:1.5.43
20+
image: gcr.io/cloud-spanner-emulator/emulator:1.5.45
2121
ports:
2222
- 9010:9010
2323
- 9020:9020
2424

2525
steps:
26-
- uses: actions/checkout@v5
26+
- uses: actions/checkout@v6
2727
with:
2828
submodules: true
2929

.github/workflows/storage-retry-conformance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- 9000:9000
2525

2626
steps:
27-
- uses: actions/checkout@v5
27+
- uses: actions/checkout@v6
2828
with:
2929
submodules: true
3030

Directory.Packages.props

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
3030
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
3131
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version= "8.0.1" />
32-
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version= "9.10.0" />
32+
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version= "10.0.0" />
3333

3434
<!-- Misc packages (might warrant a reorganization at some point) -->
3535
<PackageVersion Include="xunit" Version="2.9.3" />
@@ -40,15 +40,13 @@
4040
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
4141
<PackageVersion Include="NSubstitute" Version="5.3.0" />
4242
<PackageVersion Include="System.Linq.AsyncEnumerable" Version="10.0.0" />
43-
<!-- This should only be used for Firestore and Datastore, and will be removed after a major release. -->
44-
<PackageVersion Include="System.Linq.Async" Version="6.0.3" />
4543
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
4644
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
4745
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
48-
<PackageVersion Include="SharpCompress" Version="0.41.0" />
46+
<PackageVersion Include="SharpCompress" Version="0.42.0" />
4947
<PackageVersion Include="NodaTime" Version="3.2.2" />
5048
<PackageVersion Include="LibGit2Sharp" Version="0.30.0" />
51-
<PackageVersion Include="NuGet.Protocol" Version="7.0.0" />
49+
<PackageVersion Include="NuGet.Protocol" Version="7.0.1" />
5250
<PackageVersion Include="Octokit" Version="14.0.0" />
5351
<PackageVersion Include="GitHubJwt" Version="0.0.6" />
5452
<PackageVersion Include="Mono.Cecil" Version="0.11.6" />

0 commit comments

Comments
 (0)