work on GHA build yml, fixes

socnetv · Nov 24, 2024 · 407c51c · 407c51c
1 parent 8ceea5b
commit 407c51c
Showing 1 changed file with 23 additions and 12 deletions.
diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml
@@ -43,6 +43,23 @@ jobs:
           ls ${{ github.workspace }}
 
 
+      #
+      # Install Qt
+      #
+
+      - if: contains( matrix.os, 'windows') && startsWith( matrix.qt-version, '6.' ) && matrix.qt-version != '6.2.4'
+        name: Prepare for Windows
+      - if: contains( matrix.os, 'ubuntu') && startsWith( matrix.qt-version, '6.' )
+        name: Install dependencies
+        run: |
+          sudo apt update
+          sudo apt install \
+            build-essential cmake ninja-build \
+            libssl-dev libxkbcommon-x11-dev libxcb-cursor-dev zlib1g-dev
+      - if: contains( matrix.os, 'macos') && startsWith( matrix.qt-version, '6.' )
+        name: Install for macOS
+
+
       #
       # Install Qt
       #
@@ -56,18 +73,12 @@ jobs:
           arch: win64_mingw
           modules: qtwebsockets core5compat xml network widgets printsupport charts svg
       - if: contains( matrix.os, 'ubuntu') && startsWith( matrix.qt-version, '6.' )
-        - name: Install dependencies
-          run: |
-            sudo apt update
-            sudo apt install \
-              build-essential cmake ninja-build \
-              libssl-dev libxkbcommon-x11-dev libxcb-cursor-dev zlib1g-dev
-        - name: Install Qt 6 on Linux
-          uses: jurplel/install-qt-action@v4
-          with:
-            aqtversion: '==2.0.0'
-            version: ${{ matrix.qt-version }}
-            modules: qtwebsockets core5compat xml network widgets printsupport charts svg
+        name: Install Qt 6 on Linux
+        uses: jurplel/install-qt-action@v4
+        with:
+          aqtversion: '==2.0.0'
+          version: ${{ matrix.qt-version }}
+          modules: qtwebsockets core5compat xml network widgets printsupport charts svg
 
       - if: contains( matrix.os, 'macos') && startsWith( matrix.qt-version, '6.' )
         name: Install Qt 6 on macOS