From ee2c3663461d79ea3934b375704593c16c99b347 Mon Sep 17 00:00:00 2001
From: Andre Schulz <andre@exhale.de>
Date: Thu, 8 Aug 2024 23:55:49 +0200
Subject: [PATCH] Test CI with Qt spec

---
 .github/workflows/main.yml | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5a05dbef..20c9c6fb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,18 +16,19 @@ jobs:
 
       matrix:
         platform:
-        - { name: Ubuntu 20.04 GCC (x86_64),   os: ubuntu-20.04, cpp_compiler: g++ }
-        - { name: Ubuntu 20.04 Clang (x86_64), os: ubuntu-20.04, cpp_compiler: clang++ }
-        - { name: Ubuntu 22.04 GCC (x86_64),   os: ubuntu-22.04, cpp_compiler: g++ }
-        - { name: Ubuntu 22.04 Clang (x86_64), os: ubuntu-22.04, cpp_compiler: clang++ }
-        - { name: Ubuntu 24.04 GCC (x86_64),   os: ubuntu-24.04, cpp_compiler: g++ }
-        - { name: Ubuntu 24.04 Clang (x86_64), os: ubuntu-24.04, cpp_compiler: clang++ }
-        - { name: macOS 12 (x86_64),           os: macos-12,     cpp_compiler: clang++ }
-        - { name: macOS 13 (x86_64),           os: macos-13,     cpp_compiler: clang++ }
-        - { name: macOS 14 (arm64),            os: macos-14,     cpp_compiler: clang++ }
+        - { name: Ubuntu 20.04 GCC (x86_64),   os: ubuntu-20.04, cpp_compiler: g++,     qmake_spec: linux-g++ }
+        - { name: Ubuntu 20.04 Clang (x86_64), os: ubuntu-20.04, cpp_compiler: clang++, qmake_spec: linux-clang }
+        - { name: Ubuntu 22.04 GCC (x86_64),   os: ubuntu-22.04, cpp_compiler: g++,     qmake_spec: linux-g++ }
+        - { name: Ubuntu 22.04 Clang (x86_64), os: ubuntu-22.04, cpp_compiler: clang++, qmake_spec: linux-clang }
+        - { name: Ubuntu 24.04 GCC (x86_64),   os: ubuntu-24.04, cpp_compiler: g++,     qmake_spec: linux-g++ }
+        - { name: Ubuntu 24.04 Clang (x86_64), os: ubuntu-24.04, cpp_compiler: clang++, qmake_spec: linux-clang }
+        - { name: macOS 12 (x86_64),           os: macos-12,     cpp_compiler: clang++, qmake_spec: macx-clang }
+        - { name: macOS 13 (x86_64),           os: macos-13,     cpp_compiler: clang++, qmake_spec: macx-clang }
+        - { name: macOS 14 (arm64),            os: macos-14,     cpp_compiler: clang++, qmake_spec: macx-clang }
 
     env:
       CXX: ${{ matrix.platform.cpp_compiler }}
+      QMAKE_SPEC: ${{ matrix.platform.qmake_spec }}
 
     steps:
     - uses: actions/checkout@v4
@@ -92,13 +93,9 @@ jobs:
         echo "::endgroup"::
 
         echo "::group::Build UMVE"
-        qmake --version
+        qmake -v
         pushd apps/umve
-        if [ "${CXX}" = "clang++" ]; then
-          echo "QMAKE_CXX = clang++" > umve.priv.pro
-          echo "QMAKE_LINK = clang++" >> umve.priv.pro
-        fi
-        qmake
+        qmake ${QMAKE_SPEC}
         make -j${NUM_CPU_CORES}
         popd
         echo "::endgroup::"