From 1ace92db7348815b4c49e9dad18797177b73e498 Mon Sep 17 00:00:00 2001
From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Sat, 28 Dec 2024 22:13:29 +0100
Subject: [PATCH] CI: move CodeQL tests to default.yaml

Github CodeQL is complaining that it can't find
the configuration for the codeql tests.
There is no documented reason for this, but there
is also no documented way to change this setting.

Move CodeQL workflows back to default.yaml to
make Github happy again
---
 .github/workflows/default.yaml | 45 ++++++++++++++++++++++++++++++++++
 .github/workflows/quick.yaml   | 28 ---------------------
 2 files changed, 45 insertions(+), 28 deletions(-)
 create mode 100644 .github/workflows/default.yaml

diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml
new file mode 100644
index 00000000000..8725edd648c
--- /dev/null
+++ b/.github/workflows/default.yaml
@@ -0,0 +1,45 @@
+# CodeQL tests apparently have to be deefined in a file
+# named default.yaml - this is not well documented
+
+name: CodeQL tests
+
+on:
+  push:
+    # test commits on this branch and staged commits
+    branches: [ "master", "auto" ]
+
+  pull_request:
+    # test PRs targeting this branch code
+    branches: [ "master" ]
+
+jobs:
+
+  CodeQL-tests:
+
+    runs-on: [ ubuntu-22.04 ]
+
+    permissions:
+      security-events: write
+
+    steps:
+
+      - name: Install Squid prerequisite Linux packages
+        run: |
+          # required for "apt-get build-dep" to work
+          sudo sed --in-place -E 's/# (deb-src.*updates main)/  \1/g' /etc/apt/sources.list
+          sudo apt-get --quiet=2 update
+          sudo apt-get --quiet=2 build-dep squid
+          sudo apt-get --quiet=2 install linuxdoc-tools libtool-bin
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+
+      - name: Build Squid
+        run: ./test-builds.sh ./test-suite/buildtests/layer-02-maximus.opts
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
+
diff --git a/.github/workflows/quick.yaml b/.github/workflows/quick.yaml
index aad03461d4a..8b0e3bb236a 100644
--- a/.github/workflows/quick.yaml
+++ b/.github/workflows/quick.yaml
@@ -154,31 +154,3 @@ jobs:
           name: build-logs-${{ matrix.os }}-${{ matrix.compiler.CC }}-${{ matrix.layer.nick }}
           path: btlayer-*.log
 
-  CodeQL-tests:
-
-    runs-on: [ ubuntu-22.04 ]
-
-    permissions:
-      security-events: write
-
-    steps:
-
-      - name: Install Squid prerequisite Linux packages
-        run: |
-          # required for "apt-get build-dep" to work
-          sudo sed --in-place -E 's/# (deb-src.*updates main)/  \1/g' /etc/apt/sources.list
-          sudo apt-get --quiet=2 update
-          sudo apt-get --quiet=2 build-dep squid
-          sudo apt-get --quiet=2 install linuxdoc-tools libtool-bin
-
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
-
-      - name: Build Squid
-        run: ./test-builds.sh ./test-suite/buildtests/layer-02-maximus.opts
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3