Skip to content

Commit 0872069

Browse files
sethmlarsonhugovk
andauthored
Apply suggestions from code review
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
1 parent fb26fc6 commit 0872069

3 files changed

Lines changed: 7 additions & 17 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,6 @@ jobs:
680680
with:
681681
oss-fuzz-project-name: ${{ matrix.oss-fuzz-project-name }}
682682
sanitizer: ${{ matrix.sanitizer }}
683-
timeout-minutes: 60
684683

685684
all-required-green: # This job does nothing and is only used for the branch protection
686685
name: All required checks pass
@@ -736,10 +735,8 @@ jobs:
736735
}}
737736
${{ !fromJSON(needs.build-context.outputs.run-windows-tests) && 'build-windows,' || '' }}
738737
${{
739-
(
740-
!fromJSON(needs.build-context.outputs.run-ci-fuzz)
741-
&& !fromJSON(needs.build-context.outputs.run-ci-fuzz-stdlib)
742-
)
738+
!fromJSON(needs.build-context.outputs.run-ci-fuzz)
739+
&& !fromJSON(needs.build-context.outputs.run-ci-fuzz-stdlib)
743740
&& 'cifuzz,' ||
744741
''
745742
}}

.github/workflows/reusable-cifuzz.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,12 @@ on:
1212
description: OSS-Fuzz sanitizer
1313
required: true
1414
type: string
15-
timeout-minutes:
16-
description: Timeout in minutes for the action
17-
required: false
18-
default: 60
19-
type: number
2015

2116
jobs:
2217
cifuzz:
23-
name: >-
24-
${{ inputs.oss-fuzz-project-name }}
25-
(${{ inputs.sanitizer }})
18+
name: ${{ inputs.oss-fuzz-project-name }} (${{ inputs.sanitizer }})
2619
runs-on: ubuntu-latest
27-
timeout-minutes: ${{ inputs.timeout-minutes }}
20+
timeout-minutes: 60
2821
steps:
2922
- name: Build fuzzers (${{ inputs.sanitizer }})
3023
id: build

Tools/build/compute-changes.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,9 @@ def compute_changes() -> None:
145145
print("Branch too old for CIFuzz tests; or no C files were changed")
146146

147147
if outputs.run_ci_fuzz_stdlib:
148-
print("Run CIFuzz tests for libraries")
148+
print("Run CIFuzz tests for stdlib")
149149
else:
150-
print("Branch too old for CIFuzz tests; or no library files were changed")
150+
print("Branch too old for CIFuzz tests; or no stdlib files were changed")
151151

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

226226
if file.parent == GITHUB_WORKFLOWS_PATH:
227-
if file.name == "build.yml" or file.name == "reusable-cifuzz.yml":
227+
if file.name in ("build.yml", "reusable-cifuzz.yml"):
228228
run_tests = run_ci_fuzz = run_ci_fuzz_stdlib = True
229229
has_platform_specific_change = False
230230
if file.name == "reusable-docs.yml":

0 commit comments

Comments
 (0)