Skip to content

Commit fcdb9b5

Browse files
committed
ci: drop base_install for CFL
No longer needed and we shouldn't be overriding build tools.
1 parent 1dfc7bf commit fcdb9b5

File tree

4 files changed

+2
-61
lines changed

4 files changed

+2
-61
lines changed

.clusterfuzzlite/cfl-common.sh

Lines changed: 0 additions & 33 deletions
This file was deleted.

.clusterfuzzlite/run-cfl-helper.sh

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,9 @@ export LC_ALL=C
66
set -o errexit -o nounset -o pipefail
77

88
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
9-
# shellcheck source=cfl-common.sh
10-
source "${SCRIPT_DIR}/cfl-common.sh"
119

1210
if [ "${1:-}" = "" ] || [ "${2:-}" = "" ]; then
13-
echo "Usage: $0 <operation> <sanitizer>" >&2
14-
echo " Supported operations: base-install, detect-symbolizer" >&2
11+
echo "Usage: $0 detect-symbolizer <sanitizer>" >&2
1512
exit 1
1613
fi
1714

@@ -21,7 +18,6 @@ shift 2 || true
2118

2219
# Resolve repository root for Docker volume mounting.
2320
ROOT_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)"
24-
APT_VER="$(cfl_apt_llvm_version)"
2521

2622
mkdir -p "${ROOT_DIR}/.cfl-base"
2723

@@ -51,19 +47,6 @@ ensure_image_cached() {
5147
}
5248

5349
case "${operation}" in
54-
base-install)
55-
packages="$(cfl_packages_for_sanitizer "${sanitizer}")"
56-
CI_RETRY_EXE_CMD='bash ./ci/retry/retry --'
57-
image='gcr.io/oss-fuzz-base/clusterfuzzlite-build-fuzzers:v1'
58-
ensure_image_cached "$image"
59-
docker run \
60-
"${docker_common[@]}" \
61-
-e "APT_LLVM_V=${APT_VER}" \
62-
-e "PACKAGES=${packages}" \
63-
-e "CI_RETRY_EXE=${CI_RETRY_EXE_CMD}" \
64-
"$image" \
65-
-lc './ci/test/01_base_install.sh'
66-
;;
6750
detect-symbolizer)
6851
image='ghcr.io/sjors/clusterfuzzlite-run-fuzzers:llvm-22-debug'
6952
ensure_image_cached "$image"
@@ -77,4 +60,4 @@ case "${operation}" in
7760
echo "Unknown operation: ${operation}" >&2
7861
exit 1
7962
;;
80-
esac
63+
esac

.github/workflows/clusterfuzzlite-cron.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ jobs:
3333
with:
3434
job_name: Coverage
3535
sanitizers_json: '{"sanitizer":["coverage"]}'
36-
run_base_install: false
3736
run_mode: coverage
3837
fuzz_seconds: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.fuzz_seconds != '' && fromJSON(github.event.inputs.fuzz_seconds) || 600 }}
3938
output_sarif: true

.github/workflows/clusterfuzzlite-shared.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ on:
2424
upload_build:
2525
type: boolean
2626
default: false
27-
run_base_install:
28-
type: boolean
29-
default: true
3027
secrets:
3128
PERSONAL_ACCESS_TOKEN:
3229
required: false
@@ -51,11 +48,6 @@ jobs:
5148
with:
5249
fetch-depth: 0
5350

54-
- name: ClusterFuzzLite base install (${{ matrix.sanitizer }})
55-
if: ${{ inputs.run_base_install }}
56-
run: ./.clusterfuzzlite/run-cfl-helper.sh base-install "${{ matrix.sanitizer }}"
57-
shell: bash
58-
5951
- name: Build fuzzers (${{ matrix.sanitizer }})
6052
uses: Sjors/clusterfuzzlite/actions/build_fuzzers@2025/10/clang-22
6153
with:

0 commit comments

Comments
 (0)