Skip to content

Commit 697c3d9

Browse files
authored
Merge branch 'main' into flatten-generated-modules
2 parents 15b09e5 + b974740 commit 697c3d9

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4732,7 +4732,13 @@ void testLocationFastSQLQueryWithJobId() throws InterruptedException {
47324732
// Use `getNumDmlAffectedRows()` for DML operations
47334733
Job queryJob = bigquery.getJob(result.getJobId());
47344734
queryJob = queryJob.waitFor();
4735+
assertNull(
4736+
queryJob.getStatus().getError(),
4737+
"Job failed with error: " + queryJob.getStatus().getError());
4738+
47354739
JobStatistics.QueryStatistics statistics = queryJob.getStatistics();
4740+
assertNotNull(
4741+
statistics.getNumDmlAffectedRows(), "DML affected rows statistics should not be null");
47364742
assertEquals(1L, statistics.getNumDmlAffectedRows().longValue());
47374743

47384744
// Verify correctness of table content

sdk-platform-java/hermetic_build/library_generation/owlbot/templates/java_library/.github/workflows/renovate_config_check.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
paths:
66
- 'renovate.json'
7+
- '.github/workflows/renovate_config_check.yaml'
78

89
jobs:
910
renovate_bot_config_validation:
@@ -18,8 +19,6 @@ jobs:
1819
with:
1920
node-version: '22'
2021

21-
- name: Install Renovate and Config Validator
22+
- name: Run Renovate Config Validator
2223
run: |
23-
npm install -g npm@latest
24-
npm install --global renovate
25-
renovate-config-validator
24+
npx --package renovate@43.136.0 renovate-config-validator

sdk-platform-java/hermetic_build/library_generation/owlbot/templates/java_library/renovate.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
"^.github/workflows/unmanaged_dependency_check.yaml$"
3030
],
3131
"matchStrings": [
32-
"uses: googleapis/google-cloud-java/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@v(?<currentValue>.+?)\\n"
32+
"uses: googleapis/google-cloud-java/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v(?<currentValue>.+?)\\n"
3333
],
34-
"depNameTemplate": "com.google.cloud:gapic-libraries-bom",
34+
"depNameTemplate": "com.google.cloud:google-cloud-shared-dependencies",
3535
"datasourceTemplate": "maven"
3636
}
3737
],

0 commit comments

Comments
 (0)