From c6cabc7aa14e81e712574f3f7a13ab5c3c2444b8 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <dismine@gmail.com>
Date: Wed, 15 Feb 2023 13:05:41 +0200
Subject: [PATCH] Manually setup correct compiler.

---
 .cirrus.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index abc9fca0a..79a40831f 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -27,13 +27,13 @@ linux_qt6_task_template: &LINUX_QT6_TASK_TEMPLATE
     - which qbs
     - pwd
     #- ${COMPILER} --version
-    - ls -l /usr/bin/ | grep -E "${COMPILER_BIN}"
+    - ls -l /usr/bin/ | grep -E "${COMPILER_REGEX}"
     - qmake6 --version
     - qmake6 -query
     - qbs --version
-    - qbs setup-toolchains --detect
+    - qbs setup-toolchains /usr/bin/${COMPILER} ${COMPILER}
     - qbs setup-qt /usr/bin/qmake6 qt6
-    - qbs config profiles.qt6.baseProfile ${TOOLCHAIN}
+    - qbs config profiles.qt6.baseProfile ${COMPILER}
     - qbs-config defaultProfile qt6
     - qbs build -f valentina.qbs -d build --command-echo-mode command-line profile:qt6 config:release
     - xvfb-run -a qbs -p autotest-runner
@@ -49,7 +49,7 @@ linux_qt5_qmake_task_template: &LINUX_QT5_QMAKE_TASK_TEMPLATE
     - cd build
     - pwd
     #- ${COMPILER} --version
-    - ls -l /usr/bin/ | grep -E "${COMPILER_BIN}"
+    - ls -l /usr/bin/ | grep -E "${COMPILER_REGEX}"
     - qmake --version
     - qmake -query
     - qmake ../Valentina.pro -r -spec linux-${COMPILER} CONFIG+=noDebugSymbols CONFIG+=checkWarnings
@@ -67,7 +67,7 @@ linux_qt5_qbs_task_template: &LINUX_QT5_QBS_TASK_TEMPLATE
     - which qbs
     - pwd
     #- ${COMPILER} --version
-    - ls -l /usr/bin/ | grep -E "${COMPILER_BIN}"
+    - ls -l /usr/bin/ | grep -E "${COMPILER_REGEX}"
     - qmake --version
     - qbs --version
     - qmake -query
@@ -147,8 +147,8 @@ task:
         image: dismine/clang-ubuntu:latest
         memory: 8G  # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
       env:
-        COMPILER: clang
-        COMPILER_BIN: clang
+        COMPILER: clang++
+        COMPILER_REGEX: clang
         TOOLCHAIN: clang-16
       matrix:
         - name: 'latest Clang [Qt5 QMake]'
@@ -170,7 +170,7 @@ task:
         COMPILER: gcc
         GCC_COLORS: 'error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
         TOOLCHAIN: x86_64-pc-linux-gnu-gcc-12_2
-        COMPILER_BIN: "gcc|g\\+\\+"
+        COMPILER_REGEX: "gcc|g\\+\\+"
       matrix:
         - name: 'latest GCC [Qt5 QMake]'
           << :  *LINUX_QT5_QMAKE_TASK_TEMPLATE