Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(java_templates): mark version bumps of current library as a chore #452

Merged
merged 2 commits into from
Mar 24, 2020
Merged

chore(java_templates): mark version bumps of current library as a chore #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
184c90e
chore(java_templates): mark version bumps of current library as a chore
chingor13 Mar 23, 2020
fe14872
Merge branch 'master' into renovate-library
chingor13 Mar 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion synthtool/gcp/templates/java_library/renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
},
{
"packagePatterns": [
"^{{metadata['repo']['distribution_name']}}",
"^com.google.cloud:libraries-bom"
],
"semanticCommitType": "chore",
Expand All @@ -75,4 +76,4 @@
}
],
"semanticCommits": true
}
}
3 changes: 1 addition & 2 deletions synthtool/languages/java.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,10 +324,9 @@ def bazel_library(
def _merge_common_templates(
source_text: str, destination_text: str, file_path: Path
) -> str:
log.debug(f"merge: {file_path}")
# keep any existing pom.xml
if file_path.match("pom.xml"):
log.info(f"existing pom file found ({file_path}) - keeping the existing")
log.debug(f"existing pom file found ({file_path}) - keeping the existing")
return destination_text

# by default return the newly generated content
Expand Down