-
Notifications
You must be signed in to change notification settings - Fork 61
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.
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: re-enable HW processing for hermetic build scripts #2505
Conversation
…ild-for-hw-libs' into restore-hermetic-build-for-hw-libs
…bs' into restore-hermetic-build-for-hw-libs
Done |
…bs' into restore-hermetic-build-for-hw-libs
"repo_short": "java-bare-metal-solution", | ||
"distribution_name": "com.google.cloud:google-cloud-bare-metal-solution", | ||
"api_id": "baremetalsolution.googleapis.com", | ||
"library_type": "GAPIC_AUTO", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need to change this value to GAPIC_COMBO
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
note: Just hardcode it in the test
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
library_generation/generate_repo.py
Outdated
@@ -102,6 +108,11 @@ def generate_from_yaml( | |||
versions_file=repo_config.versions_file, | |||
) | |||
|
|||
# we skip repo_level_postprocess if not in a monorepo since it's meant for |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I know it was not introduced in this PR, can we rename repo_level_postprocess
to monorepo_postprocess
if it's meant for monorepo only?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed. Renamed to monorepo_postprocessing
@@ -46,6 +46,7 @@ def __init__( | |||
rpc_documentation: Optional[str] = None, | |||
cloud_api: Optional[bool] = True, | |||
requires_billing: Optional[bool] = True, | |||
extra_versioned_modules: Optional[str] = None, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@diegomarquezp Going forward, I'm not sure accommodating every non-standard field in repo-metadata.json in our scripts is the way to go, we may want to leave the responsibility to each handwritten library owner. For now, can you please document this new parameter in go/java-hermetic-build-config-spec?
@@ -14,5 +14,6 @@ | |||
"library_type": "GAPIC_AUTO", | |||
"requires_billing": true, | |||
"rest_documentation": "https://cloud.google.com/bare-metal/docs/reference/rest", | |||
"rpc_documentation": "https://cloud.google.com/bare-metal/docs/reference/rpc" | |||
"rpc_documentation": "https://cloud.google.com/bare-metal/docs/reference/rpc", | |||
"extra_versioned_modules": "test-module" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This parameter should not be in monorepo goldens. Do google-cloud-java
and java-bigtable
share the same test setup?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I treated this repo-metadata entry as monorepo-agnostic, but I agree it's closer to real life to not include it here. I removed it and adapted the test accordingly.
|
|
re-enables the changes from #2342 as part of milestone 3.2 of Hermetic Build
Changes:
integration_tests.py
fix-poms.py
to use monorepo and split_repo modesgenerate_composed_library.py
in order to avoid collisionsgoogle/bigtable/v2
andgoogle/bigtable/admin/v2
would both be sent to a temporaljava-bigtable-v2
folder, spoiling the files being transferred viacopy-code
.proto_path
-based folder name to achieve uniquenessAfter this PR: