Skip to content

Commit e8326fb

Browse files
committed
chore: manual fix for java-firestore migration
b/477663340
1 parent af0a2c5 commit e8326fb

File tree

7 files changed

+58
-235
lines changed

7 files changed

+58
-235
lines changed

.github/workflows/java-firestore-ci.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@ jobs:
129129
runs-on: ubuntu-latest
130130
steps:
131131
- uses: actions/checkout@v4
132+
with:
133+
fetch-depth: 0
132134
- uses: actions/setup-java@v4
133135
with:
134136
distribution: temurin
@@ -137,3 +139,5 @@ jobs:
137139
- run: .kokoro/build.sh
138140
env:
139141
JOB_TYPE: lint
142+
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
143+
BASE_SHA: ${{ github.event.pull_request.base.sha }}

.github/workflows/java-firestore-unmanaged-dependency-check.yaml

Lines changed: 0 additions & 35 deletions
This file was deleted.
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/java11"
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "integration-single"
12+
}
13+
14+
env_vars: {
15+
key: "INTEGRATION_TEST_ARGS"
16+
value: "-DFIRESTORE_NAMED_DATABASE=enterprise -DFIRESTORE_EDITION=enterprise"
17+
}
18+
19+
env_vars: {
20+
key: "GCLOUD_PROJECT"
21+
value: "java-review"
22+
}
23+
24+
env_vars: {
25+
key: "GOOGLE_APPLICATION_CREDENTIALS"
26+
value: "secret_manager/java-review_firestore-java-it"
27+
}
28+
29+
env_vars: {
30+
key: "SECRET_MANAGER_KEYS"
31+
value: "java-review_firestore-java-it"
32+
}

.kokoro/presubmit/firestore-integration.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/java11"
77
}
88

99
env_vars: {

gapic-libraries-bom/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -677,6 +677,13 @@
677677
<type>pom</type>
678678
<scope>import</scope>
679679
</dependency>
680+
<dependency>
681+
<groupId>com.google.cloud</groupId>
682+
<artifactId>google-cloud-firestore-bom</artifactId>
683+
<version>3.39.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
684+
<type>pom</type>
685+
<scope>import</scope>
686+
</dependency>
680687
<dependency>
681688
<groupId>com.google.cloud</groupId>
682689
<artifactId>google-cloud-functions-bom</artifactId>

java-firestore/.github/scripts/update_generation_config.sh

Lines changed: 0 additions & 187 deletions
This file was deleted.

java-firestore/owlbot.py

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,18 @@
4343
s.replace(f'owl-bot-staging/v1/proto-google-cloud-{service}-{version}-java/src/**/*.java', bad_license_header, license_header)
4444
s.move(library)
4545
s.remove_staging_dirs()
46-
java.common_templates(monorepo=True, excludes=[
47-
".github/*",
48-
".kokoro/*",
49-
"samples/*",
50-
"CODE_OF_CONDUCT.md",
51-
"CONTRIBUTING.md",
52-
"LICENSE",
53-
"SECURITY.md",
54-
"java.header",
55-
"license-checks.xml",
56-
"renovate.json",
57-
".gitignore"
46+
java.common_templates(
47+
monorepo=True,
48+
excludes=[
49+
".github/*",
50+
".kokoro/*",
51+
"samples/*",
52+
"CODE_OF_CONDUCT.md",
53+
"CONTRIBUTING.md",
54+
"LICENSE",
55+
"SECURITY.md",
56+
"java.header",
57+
"license-checks.xml",
58+
"renovate.json",
59+
".gitignore"
5860
])

0 commit comments

Comments
 (0)