Skip to content

Commit 6758476

Browse files
authored
Merge branch 'main' into aco
2 parents 17c3573 + faf8530 commit 6758476

14,070 files changed

Lines changed: 272875 additions & 50032 deletions

File tree

Some content is hidden

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

‎.agents/skills/new-client-library-generator/SKILL.md‎

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

‎.agents/skills/new-client-library-generator/references/generation_config_schema.md‎

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

‎.agents/skills/new-client-library-generator/references/generation_guide.md‎

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

‎.agents/skills/new-client-library-generator/references/service_yaml_mapping.md‎

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

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@
2020
/java-bigtable/ @googleapis/bigtable-team @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-librarian-team
2121
/java-firestore/ @googleapis/firestore-team @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-librarian-team
2222
/librarian.yaml @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-librarian-team
23+
/java-cloud-bom/ @googleapis/cloud-sdk-java-team
2324
/java-shared-config/ @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-librarian-team

‎.github/release-note-generation/split_release_note.py‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -63,29 +63,16 @@ def detect_modules(root_directory: Path):
6363

6464
module_path = repo_metadata_path.parent
6565
module_pom_xml = module_path / 'pom.xml'
66-
owlbot_yaml_path = module_path/ '.OwlBot-hermetic.yaml'
6766
if not module_pom_xml.exists():
6867
continue
6968
tree = ET.parse(module_pom_xml)
7069
root = tree.getroot()
7170
version = root.find('mvn:version', POM_NAMESPACES).text
7271
api_name = None
73-
if owlbot_yaml_path.exists():
74-
# If OwlBot configuration file exists (most cases), it's the better
75-
# source to get the OwlBot-generated pull request title prefix than
76-
# the repo-metadata.json
77-
with open(owlbot_yaml_path, 'r') as file:
78-
owlbot_yaml_content = file.read()
79-
match = re.search(r'api-name: (.+)', owlbot_yaml_content)
80-
if match:
81-
api_name = match.group(1)
82-
83-
if not api_name:
84-
# Fallback to repo-metadata.json (e.g. for vertexai or Spanner transitional state)
85-
if repo_metadata_path.exists():
86-
with open(repo_metadata_path, 'r') as file:
87-
repo_metadata = json.load(file)
88-
api_name = repo_metadata.get('api_shortname')
72+
if repo_metadata_path.exists():
73+
with open(repo_metadata_path, 'r') as file:
74+
repo_metadata = json.load(file)
75+
api_name = repo_metadata.get('api_shortname')
8976

9077
if api_name:
9178
modules.append(LibraryModule(module_path, api_name,
@@ -94,7 +81,6 @@ def detect_modules(root_directory: Path):
9481
else:
9582
raise Exception(f'Could not determine api-name for {repo_metadata_path}')
9683

97-
9884
return modules
9985

10086

0 commit comments

Comments
 (0)