diff options
| -rw-r--r-- | .github/workflows/build.yml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 063e3bc1..adaf484b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,6 +25,7 @@ jobs: - os: ubuntu-20.04 qt_ver: 6 qt_host: linux + qt_arch: '' qt_version: '6.2.4' qt_modules: 'qt5compat qtimageformats' qt_tools: '' @@ -42,8 +43,10 @@ jobs: - os: windows-2022 name: "Windows-Legacy-MSVC" msystem: '' + architecture: 'win32' qt_ver: 5 qt_host: windows + qt_arch: 'win32_msvc2019' qt_version: '5.15.2' qt_modules: '' qt_tools: 'tools_openssl_x86' @@ -51,8 +54,10 @@ jobs: - os: windows-2022 name: "Windows-MSVC" msystem: '' + architecture: 'x64' qt_ver: 6 qt_host: windows + qt_arch: '' qt_version: '6.4.0' qt_modules: 'qt5compat qtimageformats' qt_tools: '' @@ -62,6 +67,7 @@ jobs: macosx_deployment_target: 10.15 qt_ver: 6 qt_host: mac + qt_arch: '' qt_version: '6.3.0' qt_modules: 'qt5compat qtimageformats' qt_tools: '' @@ -189,6 +195,7 @@ jobs: version: ${{ matrix.qt_version }} host: ${{ matrix.qt_host }} target: 'desktop' + arch: ${{ matrix.qt_arch }} modules: ${{ matrix.qt_modules }} tools: ${{ matrix.qt_tools }} cache: true @@ -226,7 +233,7 @@ jobs: - name: Configure CMake (Windows MSVC) if: runner.os == 'Windows' && matrix.msystem == '' run: | - cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_BUILD_PLATFORM=${{ matrix.name }} -DLauncher_QT_VERSION_MAJOR=${{ matrix.qt_ver }} -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreadedDLL" + cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DENABLE_LTO=ON -DLauncher_BUILD_PLATFORM=${{ matrix.name }} -DLauncher_QT_VERSION_MAJOR=${{ matrix.qt_ver }} -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreadedDLL" -A${{ matrix.architecture}} # https://github.com/ccache/ccache/wiki/MS-Visual-Studio (I coudn't figure out the compiler prefix) if ("${{ env.CCACHE_VAR }}") { |