use install-qt-static action

AllanChain · Jul 14, 2024 · 026c590 · 026c590
1 parent 828973d
commit 026c590
Showing 1 changed file with 12 additions and 20 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,36 +20,28 @@ jobs:
     runs-on: ${{matrix.os}}
     steps:
     - uses: actions/checkout@v4
-
-    - name: Install Qt
-      run: |
-        cd ..
-        curl -LO https://github.com/AllanChain/static-qt6/releases/download/v6.7.2-2/qt-6.7.2-static-${{matrix.os-caption}}.zip
-        7z x qt-6.7.2-static-${{matrix.os-caption}}.zip
-
-    - name: Configure MSVC (Windows)
+    - uses: AllanChain/install-qt-static@main
+    - uses: ilammy/msvc-dev-cmd@v1
       if: contains(matrix.os, 'windows')
-      uses: ilammy/msvc-dev-cmd@v1
-
-    - name: Make Project
-      env:
-        CMAKE_TOOLCHAIN_FILE: ../../qt6_static_64/lib/cmake/Qt6/qt.toolchain.cmake
-      run: |
-        mkdir build
-        cd build
-        cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" ..
 
     - name: Build Project (Windows)
       if: contains(matrix.os, 'windows')
-      working-directory: build
       env:
         CL: /MP # Build with multiple processes
-      run: msbuild sane-break.sln /property:Configuration=Release -maxcpucount
+      run: |
+        mkdir build
+        cd build
+        qt-cmake.bat -DCMAKE_BUILD_TYPE=MinSizeRel ..
+        msbuild sane-break.sln /property:Configuration=Release -maxcpucount
 
     - name: Build Project (macOS)
       if: contains(matrix.os, 'macos')
       working-directory: build
-      run: make -j3
+      run: |
+        mkdir build
+        cd build
+        qt-cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" ..
+        make -j3
 
     - name: Packing (Windows)
       if: contains(matrix.os, 'windows')