From 2ebb0aee2c861f7a7582f79f0816ba84dc4e54fe Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <dismine@gmail.com>
Date: Fri, 12 Jan 2024 17:24:42 +0200
Subject: [PATCH] Switch back to GCC 13 for Qt5 QMake.

---
 .cirrus.yml | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index bc7cdd96c..8daffba93 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -54,8 +54,6 @@ linux_qt5_qmake_task_template: &LINUX_QT5_QMAKE_TASK_TEMPLATE
     - pwd
     - ls -l /usr/bin/ | grep -E "${COMPILER_REGEX}"
     - ${COMPILER} --version
-    - find / -name 'libstdc++.so.6' || true
-    - strings /usr/lib/x86_64-linux-gnu/libstdc++.so.6 | grep '^CXXABI_'
     - ccache --set-config max_size="$CCACHE_SIZE"
     - qmake --version
     - qmake ../Valentina.pro -r -spec ${QMAKE_SPEC} CONFIG+=noDebugSymbols CONFIG+=checkWarnings
@@ -127,6 +125,21 @@ linux_task:
           container:
             cpu: 8
             memory: 8G  # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
+    - container:
+        image: dismine/gcc-ubuntu:13
+      env:
+        COMPILER: gcc
+        QMAKE_SPEC: "linux-g++"
+        GCC_COLORS: 'error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
+        COMPILER_REGEX: "gcc|g\\+\\+"
+      matrix:
+        - name: 'GCC 13 [Qt5 QMake]'
+          << :  *LINUX_QT5_QMAKE_TASK_TEMPLATE
+          env:
+            QT_SELECT: "qt5"
+          container:
+            cpu: 2 
+            memory: 8G  # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
     - container:
         image: dismine/gcc-ubuntu:latest
       env:
@@ -135,13 +148,6 @@ linux_task:
         GCC_COLORS: 'error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
         COMPILER_REGEX: "gcc|g\\+\\+"
       matrix:
-        - name: 'latest GCC [Qt5 QMake]'
-          << :  *LINUX_QT5_QMAKE_TASK_TEMPLATE
-          env:
-            QT_SELECT: "qt5"
-          container:
-            cpu: 2 
-            memory: 8G  # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
         - name: 'latest GCC [Qt5 QBS]'
           << : *LINUX_QT5_QBS_TASK_TEMPLATE
           env: