From cfcfcb04d127851dfbf81cfc2f421dbedaa9dd39 Mon Sep 17 00:00:00 2001
From: Matt Morehouse <mattmorehouse@gmail.com>
Date: Fri, 2 Feb 2024 16:23:14 +0000
Subject: [PATCH] Revert "ci: Split out the fuzz testing"

This reverts commit 6bf97ac2591702016b19cf2e0dfaf46cd110fefa.
---
 .github/workflows/ci.yaml   | 27 +++++++++++++++
 .github/workflows/fuzz.yaml | 68 -------------------------------------
 2 files changed, 27 insertions(+), 68 deletions(-)
 delete mode 100644 .github/workflows/fuzz.yaml

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 7c8fb19d8..0162ff44c 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -179,6 +179,33 @@ jobs:
           tar -xaf cln-${{ matrix.CFG }}.tar.bz2
           make -j $(nproc) check-units installcheck VALGRIND=${{ matrix.VALGRIND }}
 
+  check-fuzz:
+    name: Run fuzz regression tests
+    runs-on: ubuntu-22.04
+    needs:
+      - prebuild
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.8
+
+      - name: Install dependencies
+        run: |
+          bash -x .github/scripts/setup.sh
+          pip install -U pip wheel poetry
+          # Export and then use pip to install into the current env
+          poetry export -o /tmp/requirements.txt --without-hashes --with dev
+          pip install -r /tmp/requirements.txt
+
+      - name: Build
+        run: |
+          ./configure --enable-debugbuild --enable-fuzzing --enable-address-sanitizer --enable-ub-sanitizer --disable-valgrind CC=clang
+          make -j $(nproc) check-fuzz
+
   integration:
     name: Test CLN ${{ matrix.name }}
     runs-on: ubuntu-22.04
diff --git a/.github/workflows/fuzz.yaml b/.github/workflows/fuzz.yaml
deleted file mode 100644
index 44ddc917a..000000000
--- a/.github/workflows/fuzz.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-name: Fuzz Testing
-on:
-  schedule:
-    - cron:  '41 3 * * *'
-env:
-  # Makes the upload-artifact work more reliably at the cost
-  # of a bit of compile time.
-  RUST_PROFILE: release
-  SLOW_MACHINE: 1
-jobs:
-  prebuild:
-    name: Pre-build checks
-    runs-on: ubuntu-20.04
-    timeout-minutes: 30
-    env:
-      BOLTDIR: bolts
-    strategy:
-      fail-fast: true
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v4
-        with:
-          python-version: 3.8
-
-      - name: Install dependencies
-        run: |
-          bash -x .github/scripts/setup.sh
-          pip install -U pip wheel poetry
-          # Export and then use pip to install into the current env
-          poetry export -o /tmp/requirements.txt --without-hashes --with dev
-          pip install -r /tmp/requirements.txt
-          # We're going to check BOLT quotes, so get the latest version
-          git clone https://github.com/lightning/bolts.git ../${BOLTDIR}
-      - name: Build
-        run: |
-          ./configure --enable-debugbuild --enable-rust
-          make -j 8
-  check-fuzz:
-    name: Run fuzz regression tests
-    runs-on: ubuntu-22.04
-    needs:
-      - prebuild
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v4
-        with:
-          python-version: 3.8
-
-      - name: Install dependencies
-        run: |
-          bash -x .github/scripts/setup.sh
-          pip install -U pip wheel poetry
-          # Export and then use pip to install into the current env
-          poetry export -o /tmp/requirements.txt --without-hashes --with dev
-          pip install -r /tmp/requirements.txt
-
-      - name: Build
-        run: |
-          ./configure --enable-debugbuild --enable-fuzzing --enable-address-sanitizer --enable-ub-sanitizer --disable-valgrind CC=clang
-          make -j $(nproc) check-fuzz
-