From bd73d0c066ca99f19a18084e5bb9db276dc44dec Mon Sep 17 00:00:00 2001
From: Adam Lamar <adamlamar@users.noreply.github.com>
Date: Tue, 17 Dec 2024 13:58:21 -0700
Subject: [PATCH] Add oracular to the build matrix

---
 .github/workflows/ci.yml | 10 +++++++---
 kiwix-desktop.pro        |  8 ++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3e5fcf2f..cad5ee68 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -57,19 +57,23 @@ jobs:
       matrix:
         target:
           - jammy-qt5
-          - noble-qt6
+          - noble-qt6.4
+          - oracular-qt6.6
         include:
           - target: jammy-qt5
             image_variant: jammy
             lib_postfix: '/x86_64-linux-gnu'
-          - target: noble-qt6
+          - target: noble-qt6.4
             image_variant: noble
             lib_postfix: '/x86_64-linux-gnu'
+          - target: oracular-qt6.6
+            image_variant: oracular
+            lib_postfix: '/x86_64-linux-gnu'
     env:
       HOME: /home/runner
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:2024-12-17
+      image: ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:2024-12-18
 
     steps:
       - name: Install dependencies
diff --git a/kiwix-desktop.pro b/kiwix-desktop.pro
index 79b8de98..1d5dec68 100644
--- a/kiwix-desktop.pro
+++ b/kiwix-desktop.pro
@@ -24,6 +24,14 @@ QMAKE_LFLAGS +=  -std=c++17
 
 !win32 {
     QMAKE_CXXFLAGS += -Werror
+    equals(QT_MAJOR_VERSION, 6):equals(QT_MINOR_VERSION, 6) {
+        # Fail the build on errors, except for 'template-id-cdtor' due to a problem with Qt headers.
+        # This can be removed when the Ubuntu package is fixed.
+        # See
+        # https://github.com/RfidResearchGroup/proxmark3/issues/2382
+        # https://bugreports.qt.io/browse/QTBUG-126989
+        QMAKE_CXXFLAGS += -Wno-error=template-id-cdtor
+    }
 }
 
 !win32:!static {