Skip to content

Commit 4cfc0ec

Browse files
committed
manual changes
1 parent 7b3bb4f commit 4cfc0ec

4 files changed

Lines changed: 42 additions & 264 deletions

File tree

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

Lines changed: 0 additions & 35 deletions
This file was deleted.
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
deep-remove-regex:
2+
- "/grpc-google-.*/src"
3+
- "/proto-google-.*/src"
4+
- "/google-cloud-firestore/src/.*/java/com/google/cloud/firestore/v1/"
5+
- "/google-cloud-firestore-admin/src"
6+
7+
deep-preserve-regex:
8+
- "/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
9+
- "/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentPathName.java"
10+
- "/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/AnyPathName.java"
11+
- "/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DatabaseRootName.java"
12+
- "/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentRootName.java"
13+
- "/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ParentName.java"
14+
- "/proto-google-cloud-firestore-v1/src/main/proto/firestore"
15+
16+
deep-copy-regex:
17+
- source: "/google/firestore/(v\\d)/.*-java/proto-google-.*/src"
18+
dest: "/owl-bot-staging/$1/proto-google-cloud-firestore-$1/src"
19+
- source: "/google/firestore/(v\\d)/.*-java/grpc-google-.*/src"
20+
dest: "/owl-bot-staging/$1/grpc-google-cloud-firestore-$1/src"
21+
- source: "/google/firestore/(v\\d)/.*-java/gapic-google-.*/src"
22+
dest: "/owl-bot-staging/$1/google-cloud-firestore/src"
23+
- source: "/google/firestore/admin/(v\\d)/.*-java/proto-google-.*/src"
24+
dest: "/owl-bot-staging/$1/proto-google-cloud-firestore-admin-$1/src"
25+
- source: "/google/firestore/admin/(v\\d)/.*-java/grpc-google-.*/src"
26+
dest: "/owl-bot-staging/$1/grpc-google-cloud-firestore-admin-$1/src"
27+
- source: "/google/firestore/admin/(v\\d)/.*-java/gapic-google-.*/src"
28+
dest: "/owl-bot-staging/$1/google-cloud-firestore-admin/src"
29+
- source: "/google/firestore/bundle/.*-java/proto-google-.*/src"
30+
dest: "/owl-bot-staging/v1/proto-google-cloud-firestore-bundle-v1/src"

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

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

java-firestore/owlbot.py

Lines changed: 12 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -76,46 +76,16 @@
7676

7777
s.remove_staging_dirs()
7878

79-
java.common_templates(excludes=[
80-
# firestore uses a different project for its integration tests
81-
# due to the default project running datastore
82-
'.kokoro/presubmit/integration.cfg',
83-
'.kokoro/presubmit/graalvm-native-a.cfg',
84-
'.kokoro/presubmit/graalvm-native-b.cfg',
85-
'.kokoro/presubmit/graalvm-native-c.cfg',
86-
'.kokoro/presubmit/samples.cfg',
87-
'.kokoro/nightly/integration.cfg',
88-
'.kokoro/nightly/java11-integration.cfg',
89-
'.kokoro/nightly/samples.cfg',
90-
'.kokoro/build.sh',
91-
'samples/snapshot/pom.xml',
92-
'.kokoro/release/publish_javadoc.sh',
93-
'.kokoro/release/publish_javadoc11.sh',
94-
'.kokoro/release/stage.sh',
95-
'.kokoro/requirements.in',
96-
'.kokoro/requirements.txt',
97-
'.github/CODEOWNERS',
98-
'.github/workflows/samples.yaml',
99-
'renovate.json'
79+
java.common_templates(monorepo=True, excludes=[
80+
".github/*",
81+
".kokoro/*",
82+
"samples/*",
83+
"CODE_OF_CONDUCT.md",
84+
"CONTRIBUTING.md",
85+
"LICENSE",
86+
"SECURITY.md",
87+
"java.header",
88+
"license-checks.xml",
89+
"renovate.json",
90+
".gitignore"
10091
])
101-
102-
# Fix for b/442875200: Inject library_path_overrides for FirestoreAdminClient
103-
# This ensures the doclet links to the correct source directory (google-cloud-firestore-admin)
104-
# instead of the default artifactId (google-cloud-firestore).
105-
metadata_path = ".repo-metadata.json"
106-
try:
107-
with open(metadata_path, "r") as f:
108-
metadata = json.load(f)
109-
110-
# Add the override map if it doesn't exist or update it
111-
if "library_path_overrides" not in metadata:
112-
metadata["library_path_overrides"] = {}
113-
114-
metadata["library_path_overrides"]["FirestoreAdminClient"] = "google-cloud-firestore-admin"
115-
116-
# Write the updated metadata back to the file
117-
with open(metadata_path, "w") as f:
118-
json.dump(metadata, f, indent=2)
119-
f.write("\n")
120-
except Exception as e:
121-
print(f"Failed to update .repo-metadata.json: {e}")

0 commit comments

Comments
 (0)