Restore the simplied workflow syntax

Since the previous commit fixed it.
pcolby · Jan 7, 2025 · 1ae1534 · 1ae1534
1 parent fa85c40
commit 1ae1534
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -457,15 +457,15 @@ jobs:
           #- { qt: '6.6.3',   toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
           #- { qt: '6.6.3',   toolchain: msvc,  arch: arm64,  aqtArch: win64_msvc2019_arm64 }
           #- { qt: '6.6.3',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2019_64 }
-          - { qt: '6.7.3',   toolchain: llvm,  arch: x86-64, aqtArch: win64_llvm_mingw, generator: 'MinGW Makefiles', dll: libQtPokit.dll, aqtTools: 'tools_llvm_mingw1706' }
+          - { qt: '6.7.3',   toolchain: llvm,  arch: x86-64, aqtArch: win64_llvm_mingw }
           #- { qt: '6.7.3',   toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
           #- { qt: '6.7.3',   toolchain: msvc,  arch: arm64,  aqtArch: win64_msvc2019_arm64 }
           #- { qt: '6.7.3',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2019_64 }
-          - { qt: '6.8.1',   toolchain: llvm,  arch: x86-64, aqtArch: win64_llvm_mingw, generator: 'MinGW Makefiles', dll: libQtPokit.dll, aqtTools: 'tools_llvm_mingw1706' }
+          - { qt: '6.8.1',   toolchain: llvm,  arch: x86-64, aqtArch: win64_llvm_mingw }
           #- { qt: '6.8.1',   toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
           #- { qt: '6.8.1',   toolchain: msvc,  arch: arm64,  aqtArch: win64_msvc2022_arm64_cross_compiled }
           #- { qt: '6.8.1',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2022_64 }
-          - { qt: '6.9.0',   toolchain: llvm,  arch: x86-64, aqtArch: win64_llvm_mingw, generator: 'MinGW Makefiles', dll: libQtPokit.dll, aqtTools: 'tools_llvm_mingw1706' }
+          - { qt: '6.9.0',   toolchain: llvm,  arch: x86-64, aqtArch: win64_llvm_mingw }
           #- { qt: '6.9.0',   toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
           #- { qt: '6.9.0',   toolchain: msvc,  arch: arm64,  aqtArch: win64_msvc2022_arm64_cross_compiled }
           #- { qt: '6.9.0',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2022_64 }
@@ -474,7 +474,7 @@ jobs:
           #- { toolchain: msvc, arch: x86,    msvcArch: amd64_x86 }
           #- { toolchain: msvc, arch: x86-64, msvcArch: amd64 }
           # Define the generator and dll names per toolchain.
-          #- { toolchain: 'llvm',  generator: 'MinGW Makefiles', dll: libQtPokit.dll }
+          - { toolchain: 'llvm',  generator: 'MinGW Makefiles', dll: libQtPokit.dll }
           #- { toolchain: 'mingw', generator: 'MinGW Makefiles', dll: libQtPokit.dll }
           #- { toolchain: 'msvc',  generator: 'NMake Makefiles', dll: QtPokit.dll }
           # Use Qt-provided 64-bit MinGW for recent Qt's (defaulting to GitHub's 12.2.0 version for older Qt versions).
@@ -483,11 +483,11 @@ jobs:
           #- { toolchain: 'mingw', arch: x86-64, qt: '6.4.3',  aqtTools: 'tools_mingw1310' }
           #- { toolchain: 'mingw', arch: x86-64, qt: '6.5.3',  aqtTools: 'tools_mingw1310' }
           #- { toolchain: 'mingw', arch: x86-64, qt: '6.6.3',  aqtTools: 'tools_mingw1310' }
-          #- { toolchain: 'llvm',  arch: x86-64, qt: '6.7.3',  aqtTools: 'tools_llvm_mingw1706' }
+          - { toolchain: 'llvm',  arch: x86-64, qt: '6.7.3',  aqtTools: 'tools_llvm_mingw1706' }
           #- { toolchain: 'mingw', arch: x86-64, qt: '6.7.3',  aqtTools: 'tools_mingw1310' }
-          #- { toolchain: 'llvm',  arch: x86-64, qt: '6.8.1',  aqtTools: 'tools_llvm_mingw1706' }
+          - { toolchain: 'llvm',  arch: x86-64, qt: '6.8.1',  aqtTools: 'tools_llvm_mingw1706' }
           #- { toolchain: 'mingw', arch: x86-64, qt: '6.8.1',  aqtTools: 'tools_mingw1310' }
-          #- { toolchain: 'llvm',  arch: x86-64, qt: '6.9.0',  aqtTools: 'tools_llvm_mingw1706' }
+          - { toolchain: 'llvm',  arch: x86-64, qt: '6.9.0',  aqtTools: 'tools_llvm_mingw1706' }
           #- { toolchain: 'mingw', arch: x86-64, qt: '6.9.0',  aqtTools: 'tools_mingw1310' }
     steps:
       - name: Configure path