diff options
| author | jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com> | 2021-03-23 09:22:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-23 09:22:53 -0700 |
| commit | 00ad715801a8d3a2041b571968526221b7d9668f (patch) | |
| tree | e11547417a9b94d4c997585754562d6b36de203c /infra | |
| parent | 6de9a3b187a27f16a595503892038ce69f70c87c (diff) | |
| download | oss-fuzz-00ad715801a8d3a2041b571968526221b7d9668f.tar.gz | |
[CIFuzz] Make it possible to skip bad build check. (#5475)
This will mainly be useful for non-OSS-Fuzz users.
Though it can also be used by OSS-Fuzz users to speed things
up (very slightly in most cases).
Fixes #4377
Diffstat (limited to 'infra')
| -rw-r--r-- | infra/cifuzz/actions/build_fuzzers/action.yml | 5 | ||||
| -rw-r--r-- | infra/cifuzz/build_fuzzers_entrypoint.py | 7 | ||||
| -rw-r--r-- | infra/cifuzz/config_utils.py | 1 |
3 files changed, 12 insertions, 1 deletions
diff --git a/infra/cifuzz/actions/build_fuzzers/action.yml b/infra/cifuzz/actions/build_fuzzers/action.yml index a8a81ac02..835b7b430 100644 --- a/infra/cifuzz/actions/build_fuzzers/action.yml +++ b/infra/cifuzz/actions/build_fuzzers/action.yml @@ -24,6 +24,10 @@ inputs: build-integration-path: description: "The path to the the project's build integration." required: false + bad-build-check: + description: "Whether or not OSS-Fuzz's check for bad builds should be done." + required: false + default: true runs: using: 'docker' image: '../../../build_fuzzers.Dockerfile' @@ -36,3 +40,4 @@ runs: PROJECT_SRC_PATH: ${{ inputs.project-src-path }} BUILD_INTEGRATION_PATH: ${{ inputs.build-integration-path }} LOW_DISK_SPACE: 'True' + BAD_BUILD_CHECK: ${{ inputs.bad-build-check }} diff --git a/infra/cifuzz/build_fuzzers_entrypoint.py b/infra/cifuzz/build_fuzzers_entrypoint.py index ddae68197..04f562068 100644 --- a/infra/cifuzz/build_fuzzers_entrypoint.py +++ b/infra/cifuzz/build_fuzzers_entrypoint.py @@ -72,8 +72,13 @@ def main(): return returncode out_dir = os.path.join(config.workspace, 'out') + + if not config.bad_build_check: + # If we've gotten to this point and we don't need to do bad_build_check, + # then the build has succeeded. + returncode = 0 # yapf: disable - if build_fuzzers.check_fuzzer_build( + elif build_fuzzers.check_fuzzer_build( out_dir, config.sanitizer, config.language, diff --git a/infra/cifuzz/config_utils.py b/infra/cifuzz/config_utils.py index 9cf018bfd..ad2cd36c6 100644 --- a/infra/cifuzz/config_utils.py +++ b/infra/cifuzz/config_utils.py @@ -172,6 +172,7 @@ class BuildFuzzersConfig(BaseConfig): self.allowed_broken_targets_percentage = os.getenv( 'ALLOWED_BROKEN_TARGETS_PERCENTAGE') + self.bad_build_check = environment.get_bool('BAD_BUILD_CHECK', 'true') # TODO(metzman): Use better system for interpreting env vars. What if env # var is set to '0'? |