From 2d2e2da09f7ee38b70108adf71f536e03dc44ce8 Mon Sep 17 00:00:00 2001
From: Dongxu Li <dongxuli2011@gmail.com>
Date: Sat, 4 May 2024 07:48:41 -0400
Subject: [PATCH] CI: widown2022

---
 .github/workflows/build-all.yml |  4 ++--
 .github/workflows/codeql.yml    | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-all.yml b/.github/workflows/build-all.yml
index d4e156e4c1..45e1ffacee 100644
--- a/.github/workflows/build-all.yml
+++ b/.github/workflows/build-all.yml
@@ -28,12 +28,12 @@ jobs:
 
       - name: Install Clang
         run: |
-          sudo apt-get -qq install clang-15 clang-tools-15
+          sudo apt-get -qq install clang-17 clang-tools-17
 
       - name: Build and analyze
         run: |
           export CC=g++
-          export ANALYZE="scan-build-15 -o out --use-cc=g++ --use-analyzer=/usr/bin/clang++ "
+          export ANALYZE="scan-build-17 -o out --use-cc=g++ --use-analyzer=/usr/bin/clang++ "
           ${ANALYZE}qmake6 -r librecad.pro CONFIG+=debug_and_release PREFIX=/usr
           ${ANALYZE}make release -j$(nproc)
 
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 4db0e05314..750ad83b70 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -2,7 +2,7 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ 'master', '2.2' ]
+    branches: [ 'master', '2.2.1' ]
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ 'master' ]
@@ -13,9 +13,7 @@ jobs:
   analyze:
     name: Analyze
 
-    runs-on: ubuntu-22.04
-    env:
-      platform_version: 22.04
+    runs-on: ubuntu-latest
 
     permissions:
       actions: read
@@ -40,13 +38,13 @@ jobs:
     - name: Install Qt and dependencies
       run: |
         sudo apt-get -y update
-        sudo apt-get -qq install qtbase5-dev libqt5svg5-dev qt5-qmake qtbase5-dev-tools qttools5-dev-tools qtchooser libgl-dev libmuparser-dev libboost-dev librsvg2-bin libfreetype6-dev libicu-dev pkg-config libfuse2
+        sudo apt-get -qq install qt6-base-dev qt6-base-dev-tools qt6-declarative-dev qmake6 qtchooser libgl-dev libmuparser-dev libboost-dev librsvg2-bin libfreetype6-dev libicu-dev pkg-config libfuse2
         sudo ln -snf /usr/lib/x86_64-linux-gnu/qtchooser/qt5.conf /usr/lib/x86_64-linux-gnu/qtchooser/default.conf
         sudo rm -rf /usr/local/lib/android
 
     - name: Install Clang
       run: |
-        sudo apt-get -qq install clang-15 clang-tools-15
+        sudo apt-get -qq install clang-17 clang-tools-17
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL