ofg: prepare use of cached images #12693
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: David Korczynski <[email protected]>
Signed-off-by: David Korczynski <[email protected]>
Signed-off-by: David Korczynski <[email protected]>
|
The CACHE_IMAGE is defined as argument to the Dockerfile as created in this PR: google/oss-fuzz-gen#696 |
oliverchang
reviewed
Nov 6, 2024
infra/build/functions/build_lib.py
Outdated
| @@ -387,7 +387,8 @@ def get_docker_build_step(image_names, | |||
| directory, | |||
| use_buildkit_cache=False, | |||
| src_root='oss-fuzz', | |||
| architecture='x86_64'): | |||
| architecture='x86_64', | |||
| cache_name=''): | |||
There was a problem hiding this comment.
nit: replace cache_name with cache_image to be clearer.
| if use_caching: | ||
| # Use cached built image. | ||
| build_steps = [] | ||
| cache_name = ('us-central1-docker.pkg.dev/oss-fuzz/oss-fuzz-gen/' |
There was a problem hiding this comment.
can we reuse the existing stuff here instead?
We probably need to just remove lines 188-189, and just have:
def cached_image(self):
return _CACHED_IMAGE.format(name=self.real_name, sanitizer=self.cached_sanitizer)
We'll also have to delete lines 380-381 in this file, and just move the project.cached_sanitizer = project.sanitizers[0] here. Please also add a TODO here to support multiple sanitizers.
There was a problem hiding this comment.
Please also add a TODO here to support multiple sanitizers.
I don't think we need this because we set it one at the time:
and
Signed-off-by: David Korczynski <[email protected]>
Signed-off-by: David Korczynski <[email protected]>
oliverchang
approved these changes
Nov 7, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ref: google/oss-fuzz-gen#696