diff --git a/.github/workflows/ci-win.yml b/.github/workflows/ci-win.yml index edbd8a32..7a241266 100644 --- a/.github/workflows/ci-win.yml +++ b/.github/workflows/ci-win.yml @@ -39,6 +39,12 @@ jobs: platform: x64, qt: 5.15.2 } + - { + name: "Build On Win64 Qt 5.15.5", + arch: win64_msvc2019_64, + platform: x64, + qt: 5.15.x + } steps: # Checks-out your repository under $GITHUB_WORKSPACE. @@ -60,7 +66,8 @@ jobs: path: ../Qt key: ${{ runner.os }}-${{matrix.config.arch}}-QtCache-5.12-1 - - name: Install Qt + - name: Install Qt Official Build + if: ${{matrix.config.qt != '5.15.x'}} uses: jurplel/install-qt-action@v2 with: version: ${{matrix.config.qt}} @@ -70,6 +77,16 @@ jobs: tools: tools_openssl_${{matrix.config.platform}},1.1.1-4,qt.tools.openssl.win_${{matrix.config.platform}} cached: ${{ steps.cache-qt.outputs.cache-hit }} + - name: Install Qt Private Build + if: ${{ matrix.config.qt == '5.15.x' }} + shell: cmd + # https://build-qt.fsu0413.me/5.15-series/5.15.5-for-windows/ + run: | + C:\msys64\usr\bin\wget.exe -q https://mirrors.gigenet.com/OSDN//users/38/38692/Qt5.15.5-Windows-x86_64-VS2019-16.11.16-20220627.7z + 7z x Qt5.15*.7z + del Qt5.15*.7z + move Qt5.15* Qt5.15 + - name: Create Build Dir shell: bash run: mkdir build @@ -84,6 +101,8 @@ jobs: - name: Configure and Build Project shell: cmd run: | + set PATH=%PATH%;%GITHUB_WORKSPACE%\Qt5.15\bin + qmake --version call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{matrix.config.platform}} qmake -r -spec win32-msvc CONFIG-=debug CONFIG+=release %GITHUB_WORKSPACE%\vnote.pro nmake @@ -92,6 +111,8 @@ jobs: - name: Package Project shell: cmd run: | + set PATH=%PATH%;%GITHUB_WORKSPACE%\Qt5.15\bin + qmake --version mkdir "%DISTRIB_PATH%" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{matrix.config.platform}} windeployqt.exe --dir "%DISTRIB_PATH%" .\src\release\vnote.exe