From 3774b3cbcfc5d7d2f02386a712628ea8e37c1e17 Mon Sep 17 00:00:00 2001
From: Sjors Provoost <sjors@sprovoost.nl>
Date: Tue, 9 Dec 2025 15:17:11 +0100
Subject: [PATCH 1/2] ci: copy fuzz target list into OUT

Expose fuzz_targets.txt in $OUT so run-fuzzers sees targets.

Assisted-by: GitHub Copilot
Assisted-by: OpenAI GPT-5.1-Codex-Max
---
 .clusterfuzzlite/build.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.clusterfuzzlite/build.sh b/.clusterfuzzlite/build.sh
index f638031d..bc48bde3 100755
--- a/.clusterfuzzlite/build.sh
+++ b/.clusterfuzzlite/build.sh
@@ -89,6 +89,9 @@ if [ ${#FUZZ_TARGETS[@]} -eq 0 ]; then
   exit 1
 fi
 
+# Expose the discovered targets to the run-fuzzers container.
+cp "$WORK/fuzz_targets.txt" "$OUT/fuzz_targets.txt"
+
 # Must match FuzzTargetPlaceholder in src/test/fuzz/fuzz.cpp so the python
 # patching below can locate the placeholder string.
 MAGIC_STR="d6f1a2b39c4e5d7a8b9c0d1e2f30415263748596a1b2c3d4e5f60718293a4b5c6d7e8f90112233445566778899aabbccddeeff00fedcba9876543210a0b1c2d3"

From 7bfb309e5e4a90ba21a13edb8517d5e48c8f84e2 Mon Sep 17 00:00:00 2001
From: Sjors Provoost <sjors@sprovoost.nl>
Date: Tue, 9 Dec 2025 11:44:19 +0100
Subject: [PATCH 2/2] ci: CFL migrates to Ubuntu 24.04

It should no longer be needed to use a fork.
---
 .clusterfuzzlite/Dockerfile                  | 2 +-
 .github/workflows/clusterfuzzlite-shared.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.clusterfuzzlite/Dockerfile b/.clusterfuzzlite/Dockerfile
index fbc79305..6a734a08 100644
--- a/.clusterfuzzlite/Dockerfile
+++ b/.clusterfuzzlite/Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 
 RUN apt-get update && apt-get install -y \
   build-essential \
diff --git a/.github/workflows/clusterfuzzlite-shared.yml b/.github/workflows/clusterfuzzlite-shared.yml
index 088de2fe..09c34d23 100644
--- a/.github/workflows/clusterfuzzlite-shared.yml
+++ b/.github/workflows/clusterfuzzlite-shared.yml
@@ -49,7 +49,7 @@ jobs:
           fetch-depth: 0
 
       - name: Build fuzzers (${{ matrix.sanitizer }})
-        uses: Sjors/clusterfuzzlite/actions/build_fuzzers@2026/02/clang-22-v2
+        uses: google/clusterfuzzlite/actions/build_fuzzers@migrate-to-ubuntu-24-04
         with:
           language: c++
           sanitizer: ${{ matrix.sanitizer }}
@@ -83,7 +83,7 @@ jobs:
 
       - name: Run fuzzers (${{ matrix.sanitizer }})
         if: ${{ inputs.run_fuzzers }}
-        uses: Sjors/clusterfuzzlite/actions/run_fuzzers@2026/02/clang-22-v2
+        uses: google/clusterfuzzlite/actions/run_fuzzers@migrate-to-ubuntu-24-04
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           sanitizer: ${{ matrix.sanitizer }}