Parameterize modules based on qt version

This DRY's up the test.yml to make it easier to add/improve tests.
jurplel · Mar 18, 2023 · 7693791 · 7693791
1 parent 05e8c48
commit 7693791
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -38,10 +38,14 @@ jobs:
         qt:
           - version: "5.9.0"
             requested: "5.9.0"
+            modules: qtwebengine
           - version: "5.15.2"
             requested: "5.15"
+            modules: qtwebengine
           - version: "6.3.2"  # Qt 6.3 is not an LTS version, so '6.3.*' always resolves to '6.3.2'
             requested: "6.3.*"
+            # In Qt 6.2.0+, qtwebengine requires qtpositioning and qtwebchannel
+            modules: qtwebengine qtpositioning qtwebchannel
           - version: null   # Tools-only build
             requested: null
         cache:
@@ -66,21 +70,10 @@ jobs:
           cd action
           npm run build
 
-      - name: Install Qt5 with options
-        if: ${{ matrix.qt.version && startsWith(matrix.qt.version, '5') }}
+      - name: Install Qt with options
         uses: ./
         with:
-          modules: qtwebengine
-          version: ${{ matrix.qt.requested }}
-          tools: tools_ifw tools_qtcreator,qt.tools.qtcreator
-          cache: ${{ matrix.cache == 'cached' }}
-
-      - name: Install Qt6 with options
-        if: ${{ matrix.qt.version && startsWith(matrix.qt.version, '6') }}
-        uses: ./
-        with:
-          # In Qt 6.2.0+, qtwebengine requires qtpositioning and qtwebchannel
-          modules: qtwebengine qtpositioning qtwebchannel
+          modules: ${{ matrix.qt.modules }}
           version: ${{ matrix.qt.requested }}
           tools: tools_ifw tools_qtcreator,qt.tools.qtcreator
           cache: ${{ matrix.cache == 'cached' }}