https://github.com/python/cpython/commit/5a869d543a9f5bbff9d47b462d2b2afd4d990503 commit: 5a869d543a9f5bbff9d47b462d2b2afd4d990503 branch: 3.13 author: Hugo van Kemenade <[email protected]> committer: hugovk <[email protected]> date: 2026-11-15T12:32:11Z summary:
[3.13] Remove CIFuzz GitHub Action (GH-161812) (#162039) (cherry picked from commit de27073fb1ed7814f18b4f87a734327d36c5e721) Co-authored-by: Stan Ulbrych <[email protected]> files: D .github/workflows/reusable-cifuzz.yml M .github/workflows/build.yml M .github/workflows/reusable-context.yml M Lib/test/test_tools/test_compute_changes.py M Tools/build/compute-changes.py diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 94fd3d7bac4956e..f3be5661d016583 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -541,50 +541,6 @@ jobs: sanitizer: ${{ matrix.sanitizer }} free-threading: ${{ matrix.free-threading }} - cifuzz: - # ${{ '' } is a hack to nest jobs under the same sidebar category. - name: CIFuzz${{ '' }} # zizmor: ignore[obfuscation] - needs: build-context - if: >- - needs.build-context.outputs.run-ci-fuzz == 'true' - || needs.build-context.outputs.run-ci-fuzz-stdlib == 'true' - permissions: - contents: read - security-events: write - strategy: - fail-fast: false - matrix: - sanitizer: - - address - oss-fuzz-project-name: - - cpython3 - - python3-libraries - include: - - sanitizer: undefined - oss-fuzz-project-name: cpython3 - - sanitizer: memory - oss-fuzz-project-name: cpython3 - exclude: - # Note that the 'no-exclude' sentinel below is to prevent - # an empty string value from excluding all jobs and causing - # GHA to create a 'default' matrix entry with all empty values. - - oss-fuzz-project-name: >- - ${{ - needs.build-context.outputs.run-ci-fuzz == 'true' - && 'no-exclude' - || 'cpython3' - }} - - oss-fuzz-project-name: >- - ${{ - needs.build-context.outputs.run-ci-fuzz-stdlib == 'true' - && 'no-exclude' - || 'python3-libraries' - }} - uses: ./.github/workflows/reusable-cifuzz.yml - with: - oss-fuzz-project-name: ${{ matrix.oss-fuzz-project-name }} - sanitizer: ${{ matrix.sanitizer }} - all-required-green: # This job does nothing and is only used for the branch protection name: All required checks pass runs-on: ubuntu-latest @@ -605,7 +561,6 @@ jobs: - test-hypothesis - build-asan - build-san - - cifuzz if: always() steps: @@ -617,7 +572,6 @@ jobs: build-windows-msi, build-ubuntu-ssltests, test-hypothesis, - cifuzz, allowed-skips: >- ${{ !fromJSON(needs.build-context.outputs.run-docs) && 'check-docs,' || '' }} ${{ @@ -635,12 +589,6 @@ 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) - && 'cifuzz,' || - '' - }} ${{ !fromJSON(needs.build-context.outputs.run-macos) && 'build-macos,' || '' }} ${{ !fromJSON(needs.build-context.outputs.run-ubuntu) diff --git a/.github/workflows/reusable-cifuzz.yml b/.github/workflows/reusable-cifuzz.yml deleted file mode 100644 index a70b75eebc4a989..000000000000000 --- a/.github/workflows/reusable-cifuzz.yml +++ /dev/null @@ -1,49 +0,0 @@ -# CIFuzz job based on https://google.github.io/oss-fuzz/getting-started/continuous-integration/ -name: Reusable CIFuzz - -on: - workflow_call: - inputs: - oss-fuzz-project-name: - description: OSS-Fuzz project name - required: true - type: string - sanitizer: - description: OSS-Fuzz sanitizer - required: true - type: string - -permissions: - contents: read - -jobs: - cifuzz: - name: ${{ inputs.oss-fuzz-project-name }} (${{ inputs.sanitizer }}) - runs-on: ubuntu-latest - timeout-minutes: 60 - steps: - - name: Build fuzzers (${{ inputs.sanitizer }}) - id: build - uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@ed23f8af80ff82b25ca67cd9b101e690b8897b3f # master - with: - oss-fuzz-project-name: ${{ inputs.oss-fuzz-project-name }} - sanitizer: ${{ inputs.sanitizer }} - - name: Run fuzzers (${{ inputs.sanitizer }}) - uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@ed23f8af80ff82b25ca67cd9b101e690b8897b3f # master - with: - fuzz-seconds: 600 - oss-fuzz-project-name: ${{ inputs.oss-fuzz-project-name }} - output-sarif: true - sanitizer: ${{ inputs.sanitizer }} - - name: Upload crash - if: failure() && steps.build.outcome == 'success' - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 - with: - name: ${{ inputs.sanitizer }}-artifacts - path: ./out/artifacts - - name: Upload SARIF - if: always() && steps.build.outcome == 'success' - uses: github/codeql-action/upload-sarif@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2 - with: - sarif_file: cifuzz-sarif/results.sarif - checkout_path: cifuzz-sarif diff --git a/.github/workflows/reusable-context.yml b/.github/workflows/reusable-context.yml index 8344a7a391505d2..5e0ecf5b2606168 100644 --- a/.github/workflows/reusable-context.yml +++ b/.github/workflows/reusable-context.yml @@ -20,12 +20,6 @@ on: # yamllint disable-line rule:truthy run-android: description: Whether to run the Android tests value: ${{ jobs.compute-changes.outputs.run-android }} # bool - run-ci-fuzz: - description: Whether to run the CIFuzz job for 'cpython' fuzzer - value: ${{ jobs.compute-changes.outputs.run-ci-fuzz }} # bool - run-ci-fuzz-stdlib: - description: Whether to run the CIFuzz job for 'python3-libraries' fuzzer - value: ${{ jobs.compute-changes.outputs.run-ci-fuzz-stdlib }} # bool run-docs: description: Whether to build the docs value: ${{ jobs.compute-changes.outputs.run-docs }} # bool @@ -58,8 +52,6 @@ jobs: timeout-minutes: 10 outputs: run-android: ${{ steps.changes.outputs.run-android }} - run-ci-fuzz: ${{ steps.changes.outputs.run-ci-fuzz }} - run-ci-fuzz-stdlib: ${{ steps.changes.outputs.run-ci-fuzz-stdlib }} run-docs: ${{ steps.changes.outputs.run-docs }} run-macos: ${{ steps.changes.outputs.run-macos }} run-tests: ${{ steps.changes.outputs.run-tests }} diff --git a/Lib/test/test_tools/test_compute_changes.py b/Lib/test/test_tools/test_compute_changes.py index 8c1acc73df36178..e34a66e5b35bd13 100644 --- a/Lib/test/test_tools/test_compute_changes.py +++ b/Lib/test/test_tools/test_compute_changes.py @@ -21,7 +21,6 @@ WASI_DIRS = compute_changes.WASI_DIRS RUN_TESTS_IGNORE = compute_changes.RUN_TESTS_IGNORE UNIX_BUILD_SYSTEM_FILE_NAMES = compute_changes.UNIX_BUILD_SYSTEM_FILE_NAMES -LIBRARY_FUZZER_PATHS = compute_changes.LIBRARY_FUZZER_PATHS class TestProcessChangedFiles(unittest.TestCase): @@ -43,18 +42,6 @@ def test_docs(self): self.assertTrue(result.run_docs) self.assertFalse(result.run_tests) - def test_ci_fuzz_stdlib(self): - for p in LIBRARY_FUZZER_PATHS: - with self.subTest(p=p): - if p.is_dir(): - f = p / "file" - elif p.is_file(): - f = p - else: - continue - result = process_changed_files({f}) - self.assertTrue(result.run_ci_fuzz_stdlib) - def test_android(self): for d in ANDROID_DIRS: with self.subTest(d=d): diff --git a/Tools/build/compute-changes.py b/Tools/build/compute-changes.py index 4fc6909f5ac7759..dafc266c06fe5e5 100644 --- a/Tools/build/compute-changes.py +++ b/Tools/build/compute-changes.py @@ -44,69 +44,16 @@ Path("Tools/build/regen-configure.sh"), }) -SUFFIXES_C_OR_CPP = frozenset({".c", ".h", ".cpp"}) SUFFIXES_DOCUMENTATION = frozenset({".rst", ".md"}) ANDROID_DIRS = frozenset({"Android"}) MACOS_DIRS = frozenset({"Mac"}) WASI_DIRS = frozenset({Path("Tools", "wasm")}) -LIBRARY_FUZZER_PATHS = frozenset({ - # All C/CPP fuzzers. - Path("configure"), - Path(".github/workflows/reusable-cifuzz.yml"), - # ast - Path("Lib/ast.py"), - Path("Python/ast.c"), - # configparser - Path("Lib/configparser.py"), - # csv - Path("Lib/csv.py"), - Path("Modules/_csv.c"), - # decode - Path("Lib/encodings/"), - Path("Modules/_codecsmodule.c"), - Path("Modules/cjkcodecs/"), - Path("Modules/unicodedata*"), - # difflib - Path("Lib/difflib.py"), - # email - Path("Lib/email/"), - # html - Path("Lib/html/"), - Path("Lib/_markupbase.py"), - # http.client - Path("Lib/http/client.py"), - # json - Path("Lib/json/"), - Path("Modules/_json.c"), - # plist - Path("Lib/plistlib.py"), - # re - Path("Lib/re/"), - Path("Modules/_sre/"), - # tarfile - Path("Lib/tarfile.py"), - # tomllib - Path("Modules/tomllib/"), - # xml - Path("Lib/xml/"), - Path("Lib/_markupbase.py"), - Path("Modules/expat/"), - Path("Modules/pyexpat.c"), - # zipfile - Path("Lib/zipfile/"), - # zoneinfo - Path("Lib/zoneinfo/"), - Path("Modules/_zoneinfo.c"), -}) - @dataclass(kw_only=True, slots=True) class Outputs: run_android: bool = False - run_ci_fuzz: bool = False - run_ci_fuzz_stdlib: bool = False run_docs: bool = False run_macos: bool = False run_tests: bool = False @@ -139,16 +86,6 @@ def compute_changes() -> None: if outputs.run_windows_tests: print("Run Windows tests") - if outputs.run_ci_fuzz: - print("Run CIFuzz tests") - else: - print("Branch too old for CIFuzz tests; or no C files were changed") - - if outputs.run_ci_fuzz_stdlib: - print("Run CIFuzz tests for stdlib") - else: - print("Branch too old for CIFuzz tests; or no stdlib files were changed") - if outputs.run_docs: print("Build documentation") @@ -197,18 +134,8 @@ def get_file_platform(file: Path) -> str | None: return None -def is_fuzzable_library_file(file: Path) -> bool: - return any( - (file.is_relative_to(needs_fuzz) and needs_fuzz.is_dir()) - or (file == needs_fuzz and file.is_file()) - for needs_fuzz in LIBRARY_FUZZER_PATHS - ) - - def process_changed_files(changed_files: Set[Path]) -> Outputs: run_tests = False - run_ci_fuzz = False - run_ci_fuzz_stdlib = False run_docs = False run_windows_tests = False run_windows_msi = False @@ -222,8 +149,8 @@ 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 in ("build.yml", "reusable-cifuzz.yml"): - run_tests = run_ci_fuzz = run_ci_fuzz_stdlib = run_windows_tests = True + if file.name == "build.yml": + run_tests = run_windows_tests = True has_platform_specific_change = False continue if file.name == "reusable-docs.yml": @@ -256,18 +183,6 @@ def process_changed_files(changed_files: Set[Path]) -> Outputs: if file not in UNIX_BUILD_SYSTEM_FILE_NAMES: run_windows_tests = True - # The fuzz tests are pretty slow so they are executed only for PRs - # changing relevant files. - if file.suffix in SUFFIXES_C_OR_CPP: - run_ci_fuzz = True - if file.parts[:2] in { - ("configure",), - ("Modules", "_xxtestfuzz"), - }: - run_ci_fuzz = True - if not run_ci_fuzz_stdlib and is_fuzzable_library_file(file): - run_ci_fuzz_stdlib = True - # Check for changed documentation-related files if doc_file: run_docs = True @@ -296,8 +211,6 @@ def process_changed_files(changed_files: Set[Path]) -> Outputs: return Outputs( run_android=run_android, - run_ci_fuzz=run_ci_fuzz, - run_ci_fuzz_stdlib=run_ci_fuzz_stdlib, run_docs=run_docs, run_macos=run_macos, run_tests=run_tests, @@ -312,10 +225,6 @@ def process_target_branch(outputs: Outputs, git_branch: str) -> Outputs: if not git_branch: outputs.run_tests = True - # CIFuzz / OSS-Fuzz compatibility with older branches may be broken. - if git_branch != GITHUB_DEFAULT_BRANCH: - outputs.run_ci_fuzz = False - if os.environ.get("GITHUB_EVENT_NAME", "").lower() == "workflow_dispatch": outputs.run_docs = True outputs.run_windows_msi = True _______________________________________________ Python-checkins mailing list -- [email protected] To unsubscribe send an email to [email protected] https://mail.python.org/mailman3//lists/python-checkins.python.org Member address: [email protected]
