Update main.yml

trikset · May 14, 2024 · 08d125d · 08d125d
1 parent 28da513
commit 08d125d
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,27 +13,26 @@ jobs:
             os-name: windows
             qt-version: '5.12'
             mingw-short-version: 73
-            qt-extra-archives: 'qtmultimedia  qtimageformats qtwinextras opengl32sw i686'
+            qt5-extra-archives: 'qtwinextras opengl32sw i686'
 
           - os: ubuntu-latest
             os-name: linux
             qt-version: '5.12'
-            qt-extra-archives: 'qtmultimedia  qtimageformats qtx11extras icu'
+            qt5-extra-archives: 'qtx11extras icu'
 
           - os: ubuntu-latest
             os-name: linux
             qt-version: '5.15'
-            qt-extra-archives: 'qtmultimedia  qtimageformats qtx11extras icu'
+            qt5-extra-archives: 'qtx11extras icu'
 
           - os: macos-12
             os-name: mac
             qt-version: '5.12'
-            qt-extra-archives: 'qtmultimedia  qtimageformats qtmacextras'
+            qt5-extra-archives: 'qtmacextras'
 
           - os: ubuntu-latest
             os-name: linux
-            qt-version: '6.5'
-            qt-extra-archives: 'icu'
+            qt-version: '6.5'            
 
     defaults:
       run:
@@ -52,10 +51,10 @@ jobs:
         with:
           version: ${{ matrix.qt-version }}
           host: ${{ matrix.os-name }}
-          modules: ${{format('{0}', (startsWith(matrix.qt-version, '6') && ' qt5compat qtmultimedia qtimageformats' || ''))}}
+          modules: ${{ startsWith(matrix.qt-version, '6') && 'qt5compat qtmultimedia qtimageformats' || '' }}
           arch: ${{ matrix.mingw-short-version != '' && format('win32_mingw{0}', matrix.mingw-short-version) || '' }}
           tools: ${{ matrix.mingw-short-version != '' && format('tools_mingw,qt.tools.win32_mingw{0}0', matrix.mingw-short-version) || '' }}
-          archives: ${{ format('qttools qtsvg qtbase qttranslations {0}', matrix.qt-extra-archives) }}
+          archives: ${{startsWith(matrix.qt-version, '6') && '' || format('qttools qtsvg qtbase qttranslations qtmultimedia  qtimageformats {0}', matrix.qt5-extra-archives) }}
           add-tools-to-path: true
           # cache: true
 
@@ -91,7 +90,7 @@ jobs:
             fi
 
       - name: QMake
-        run: "qmake${{startsWith(matrix.qt-version, '6') && '6' || '' }} trikCheckApp.pro CONFIG+=release"
+        run: qmake trikCheckApp.pro CONFIG+=release
 
       - name: QMake all
         timeout-minutes: 1