From 0dd8fe1f0f561dde70f2d88a047481230daec2e5 Mon Sep 17 00:00:00 2001
From: Timothy Flynn <trflynn89@pm.me>
Date: Tue, 27 Aug 2024 14:31:25 -0400
Subject: [PATCH] CI: Run the clang plugins during PR workflows

---
 .github/workflows/ci.yml            | 20 ++++++++++++++++----
 .github/workflows/clang-plugins.yml | 20 --------------------
 2 files changed, 16 insertions(+), 24 deletions(-)
 delete mode 100644 .github/workflows/clang-plugins.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 93c519cf5e5..8508f1922ea 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,17 +15,28 @@ jobs:
       matrix:
         os_name: ['Linux']
         os: [ubuntu-22.04]
-        fuzzer: ['NO_FUZZ', 'FUZZ']
-        toolchain: ['Clang']
+        fuzzer: ['NO_FUZZ']
+        toolchain: ['GNU']
+        clang_plugins: [false]
+
         include:
+          - os_name: 'Linux'
+            os: ubuntu-22.04
+            fuzzer: 'NO_FUZZ'
+            toolchain: 'Clang'
+            clang_plugins: true
+
           - os_name: 'macOS'
             os: macos-14
             fuzzer: 'NO_FUZZ'
             toolchain: 'Clang'
+            clang_plugins: false
+
           - os_name: 'Linux'
             os: ubuntu-22.04
-            fuzzer: 'NO_FUZZ'
-            toolchain: 'GNU'
+            fuzzer: 'FUZZ'
+            toolchain: 'Clang'
+            clang_plugins: false
 
     uses: ./.github/workflows/lagom-template.yml
     with:
@@ -33,3 +44,4 @@ jobs:
       os_name: ${{ matrix.os_name }}
       os: ${{ matrix.os }}
       fuzzer: ${{ matrix.fuzzer }}
+      clang_plugins: ${{ matrix.clang_plugins }}
diff --git a/.github/workflows/clang-plugins.yml b/.github/workflows/clang-plugins.yml
deleted file mode 100644
index 04cb0c03892..00000000000
--- a/.github/workflows/clang-plugins.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: Validate code with clang plugins
-
-# FIXME: The plugins seem to make this build uncacheable by ccache. We should figure that out and enable this job on PRs.
-#        Perhaps with https://ccache.dev/manual/latest.html#config_compiler_check, which mentions plugins.
-on: [push]
-
-concurrency:
-  group: ${{ github.workflow }}
-  cancel-in-progress: true
-
-jobs:
-  build-and-verify:
-    if: always() && github.repository == 'LadybirdBrowser/ladybird' && github.ref == 'refs/heads/master'
-
-    uses: ./.github/workflows/lagom-template.yml
-    with:
-      toolchain: 'Clang'
-      os_name: 'Linux'
-      os: 'ubuntu-22.04'
-      clang_plugins: true