From a3af6a91b8eba9b9fc2d73d519fbc82cd65c2397 Mon Sep 17 00:00:00 2001
From: Andrei Pavel <andrei@isc.org>
Date: Fri, 4 Apr 2025 11:53:45 +0300
Subject: [PATCH 1/2] [#3732] Switch CodeQL to Meson

---
 .github/workflows/codeql.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 6b9048c0c4..52d18ce80d 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -2,10 +2,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "master", "ci" ]
+    branches: [ "master", "ci", "v*_*" ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ "master", "ci" ]
+    branches: [ "master", "ci", "v*_*" ]
   schedule:
     - cron: '41 12 * * 0'
 
@@ -25,11 +25,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -44,7 +44,7 @@ jobs:
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Install dependencies
       run: |
-        ./hammer.py prepare-system -p local -w docs,netconf,perfdhcp,shell,tls,unittest
+        ./hammer.py prepare-system -p local -w all
 
     - name: Inspect system CPU
       run: cat /proc/cpuinfo
@@ -55,9 +55,8 @@ jobs:
     # Flags skipped: --with-gssapi --with-freeradius
     - name: Build Kea
       run: |
-        autoreconf -i
-        ./configure --enable-shell --enable-debug --enable-generate-docs --enable-generate-messages --enable-generate-parser --enable-logger-checks --enable-perfdhcp --enable-shell --with-libyang --with-libyang-cpp --with-openssl --with-sysrepo --with-sysrepo-cpp
-        make -j2
+        meson setup build --auto-features enabled -D fuzz=enabled -D tests=enabled -D cpp_std=c++20
+        meson compile -C build
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -70,6 +69,6 @@ jobs:
     #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"

From 540be3109bf4bac55301717f894bb92056c8fec5 Mon Sep 17 00:00:00 2001
From: Andrei Pavel <andrei@isc.org>
Date: Fri, 4 Apr 2025 11:59:19 +0300
Subject: [PATCH 2/2] [#3732] Temporarily change branch for hammer

---
 .github/workflows/codeql.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 52d18ce80d..aeeabe1e36 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -44,6 +44,9 @@ jobs:
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Install dependencies
       run: |
+        git clone https://gitlab.isc.org/isc-projects/kea.git /tmp/kea
+        cd /tmp/kea
+        git checkout 3812-switch-hammer-py-from-autotools-to-meson
         ./hammer.py prepare-system -p local -w all
 
     - name: Inspect system CPU