From aeaf5ccf6166cc264189e6ae88d1536bc13635f1 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sun, 27 Oct 2024 09:28:23 +0100
Subject: [PATCH] CI: use ubuntu-24.04 (no more Clang workaround needed); drop
 Qt 5

---
 .github/workflows/ci.yml | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 93a47c22..e4f37b42 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,7 +46,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-22.04, macos-latest, windows-latest ]
+        os: [ ubuntu-24.04, macos-latest, windows-latest ]
         qt-version: [ 6 ]
         override-compiler: [ '', GCC ] # Defaults: MSVC on Windows, Clang elsewhere
         composition: [ own-quotient, static, dynamic ]
@@ -61,20 +61,17 @@ jobs:
         - os: macos-latest
           override-compiler: GCC
         include:
-        - os: ubuntu-22.04
-          qt-version: 5
+        - os: ubuntu-24.04
           composition: own-quotient
           check: appstream # Use one of faster paths for validation
-        - os: ubuntu-22.04
-          qt-version: 5
-          composition: static
-        - os: ubuntu-22.04
-          qt-version: 5        # Use one variation with external libQuotient
-          composition: dynamic # to do CodeQL analysis (libQuotient is analysed
-          check: codeql        # in its own repo)
+        - os: ubuntu-24.04
+          # Use the variation with external libQuotient to do CodeQL analysis
+          # (libQuotient is analysed in its own repo)
+          composition: dynamic
+          check: codeql
 
     env:
-      QTKEYCHAIN_REF: v0.13.2
+      QTKEYCHAIN_REF: v0.14.3
       QUOTIENT_REF: dev
       VERSION: ${{ needs.Prepare.outputs.version }}
 
@@ -87,7 +84,7 @@ jobs:
       if: "!startsWith(matrix.os, 'ubuntu')"
       uses: jurplel/install-qt-action@v3.0.0
       with:
-        version: "6.6" # "${{ startsWith(matrix.os, 'windows') && '6.5' || '6.4' }}" # CI doesn't use Qt 5 on non-Linux any more
+        version: "6.6"
         cache: true
         cache-key-prefix: Qt
         modules: 'qtmultimedia'
@@ -98,13 +95,11 @@ jobs:
       if: startsWith(matrix.os, 'ubuntu')
       run: |
         COMMON_PKGS="libolm-dev ninja-build"
-        COMMON_PKGS="$COMMON_PKGS clang-15" # Workaround for https://github.com/actions/runner-images/issues/8659
+        #COMMON_PKGS="$COMMON_PKGS clang-15" # Workaround for https://github.com/actions/runner-images/issues/8659
         sudo apt-get -qq update
         sudo apt-get -qq install $COMMON_PKGS \
-            ${{ matrix.qt-version == 5
-                && 'qtdeclarative5-dev qttools5-dev qml-module-qtquick-controls2 qtquickcontrols2-5-dev qtmultimedia5-dev qt5keychain-dev'
-                || 'libgl1-mesa-dev qt6-declarative-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools qml6-module-qtquick-controls qt6-multimedia-dev qtkeychain-qt6-dev'
-            }}
+                libgl1-mesa-dev qt6-declarative-dev qt6-tools-dev qt6-tools-dev-tools \
+                qt6-l10n-tools qml6-module-qtquick-controls qt6-multimedia-dev qtkeychain-qt6-dev
 
     - name: Setup environment
       run: |
@@ -112,9 +107,9 @@ jobs:
             echo "CC=gcc" >>$GITHUB_ENV
             echo "CXX=g++" >>$GITHUB_ENV
         elif [[ '${{ runner.os }}' == 'Linux' ]]; then
-            # Workaround for https://github.com/actions/runner-images/issues/8659
-            echo "CC=clang-15" >>$GITHUB_ENV
-            echo "CXX=clang++-15" >>$GITHUB_ENV
+            # REMOVECOMMENT: Workaround for https://github.com/actions/runner-images/issues/8659
+            echo "CC=clang-16" >>$GITHUB_ENV
+            echo "CXX=clang++-16" >>$GITHUB_ENV
         fi
         echo "CMAKE_ARGS=-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo \
               ${{ runner.os != 'Linux' && '-DCMAKE_MAKE_PROGRAM=$IQTA_TOOLS/Ninja/ninja' || '' }} \