Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Apply suggestions from code review
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
  • Loading branch information
sethmlarson and hugovk authored Jan 16, 2026
commit 087206943dd3575bff1af94db300dfb8b27b654e
7 changes: 2 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,6 @@ jobs:
with:
oss-fuzz-project-name: ${{ matrix.oss-fuzz-project-name }}
sanitizer: ${{ matrix.sanitizer }}
timeout-minutes: 60

all-required-green: # This job does nothing and is only used for the branch protection
name: All required checks pass
Expand Down Expand Up @@ -736,10 +735,8 @@ jobs:
}}
${{ !fromJSON(needs.build-context.outputs.run-windows-tests) && 'build-windows,' || '' }}
${{
(
!fromJSON(needs.build-context.outputs.run-ci-fuzz)
&& !fromJSON(needs.build-context.outputs.run-ci-fuzz-stdlib)
)
!fromJSON(needs.build-context.outputs.run-ci-fuzz)
&& !fromJSON(needs.build-context.outputs.run-ci-fuzz-stdlib)
&& 'cifuzz,' ||
''
}}
Comment thread
sethmlarson marked this conversation as resolved.
Expand Down
11 changes: 2 additions & 9 deletions .github/workflows/reusable-cifuzz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,12 @@ on:
description: OSS-Fuzz sanitizer
required: true
type: string
timeout-minutes:
description: Timeout in minutes for the action
required: false
default: 60
type: number

jobs:
cifuzz:
name: >-
${{ inputs.oss-fuzz-project-name }}
(${{ inputs.sanitizer }})
name: ${{ inputs.oss-fuzz-project-name }} (${{ inputs.sanitizer }})
runs-on: ubuntu-latest
timeout-minutes: ${{ inputs.timeout-minutes }}
timeout-minutes: 60
Comment thread
sethmlarson marked this conversation as resolved.
steps:
- name: Build fuzzers (${{ inputs.sanitizer }})
id: build
Expand Down
6 changes: 3 additions & 3 deletions Tools/build/compute-changes.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@ def compute_changes() -> None:
print("Branch too old for CIFuzz tests; or no C files were changed")

if outputs.run_ci_fuzz_stdlib:
print("Run CIFuzz tests for libraries")
print("Run CIFuzz tests for stdlib")
else:
print("Branch too old for CIFuzz tests; or no library files were changed")
print("Branch too old for CIFuzz tests; or no stdlib files were changed")

if outputs.run_docs:
print("Build documentation")
Expand Down Expand Up @@ -224,7 +224,7 @@ def process_changed_files(changed_files: Set[Path]) -> Outputs:
doc_file = file.suffix in SUFFIXES_DOCUMENTATION or doc_or_misc

if file.parent == GITHUB_WORKFLOWS_PATH:
if file.name == "build.yml" or file.name == "reusable-cifuzz.yml":
if file.name in ("build.yml", "reusable-cifuzz.yml"):
run_tests = run_ci_fuzz = run_ci_fuzz_stdlib = True
has_platform_specific_change = False
if file.name == "reusable-docs.yml":
Expand Down
Loading