From a5eaee6e504e583a8ff144824b966f351b704020 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Thu, 4 Jan 2024 09:43:17 +0100
Subject: [PATCH] Improve CI

---
 .github/workflows/ci.yml | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7b5a0f18..56db04f0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,17 +2,24 @@ name: Build Qwt
 
 on: [push, pull_request]
 jobs:
-  ResInsight-x64:
+  build-qwt:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
         qtver: [5.12.12, 6.5.3]
+        include:
+          - qtver: 6.5.3
+            build_flags: -DUSE_QT6=TRUE
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Install Linux dependencies
+        if: contains(matrix.os, 'ubuntu')
+        run: sudo apt-get install libxkbcommon-x11-0 libgl1-mesa-dev mesa-common-dev libglfw3-dev libglu1-mesa-dev
+
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
@@ -20,23 +27,11 @@ jobs:
           dir: "${{ github.workspace }}/Qt/"
           cache: true
           cache-key-prefix: ${{ matrix.qtver }}-${{ matrix.os }}
-
-      - name: Install Linux dependencies
-        if: "contains( matrix.os, 'ubuntu')"
-        run: sudo apt-get install libxkbcommon-x11-0 libgl1-mesa-dev mesa-common-dev libglfw3-dev libglu1-mesa-dev
       
       - name: Use MSVC (Windows)
         uses: ilammy/msvc-dev-cmd@v1
 
-      - name: Configure 5.12
-        if: "contains( matrix.qtver, '5.12')"
-        run: |
-          cmake -S . -B build
-
-      - name: Configure 6.5
-        if: "contains( matrix.qtver, '6.5')"
+      - name: Configure and build
         run: |
-          cmake -S . -DUSE_QT6=TRUE -B build
-  
-      - name: Build
-        run: cmake --build build
+          cmake -S . ${{matrix.build_flags}} -B build
+          cmake --build build