diff --git a/.github/workflows/windows-x64.yml b/.github/workflows/windows-x64.yml index 0dfae7b4..cb7846b3 100644 --- a/.github/workflows/windows-x64.yml +++ b/.github/workflows/windows-x64.yml @@ -43,7 +43,7 @@ jobs: - name: Install QT and jom run: | pip install aqtinstall - python -m aqt install 5.14.0 windows desktop win64_msvc2017_64 + python -m aqt install 5.14.1 windows desktop win64_msvc2017_64 7z x jom.zip - name: Prepare pyotherside @@ -57,7 +57,7 @@ jobs: - name: Build and install pyotherside run: | - set PATH=D:\a\yubioath-desktop\yubioath-desktop\5.14.0\msvc2017_64\bin;D:\a\yubioath-desktop\yubioath-desktop;%PATH% + set PATH=D:\a\yubioath-desktop\yubioath-desktop\5.14.1\msvc2017_64\bin;D:\a\yubioath-desktop\yubioath-desktop;%PATH% call C:\"Program Files (x86)\Microsoft Visual Studio"\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat x64 cd pyotherside-%PYOTHERSIDE_VER% qmake @@ -67,7 +67,7 @@ jobs: - name: Build app run: | - set PATH=D:\a\yubioath-desktop\yubioath-desktop\5.14.0\msvc2017_64\bin;D:\a\yubioath-desktop\yubioath-desktop;%PATH% + set PATH=D:\a\yubioath-desktop\yubioath-desktop\5.14.1\msvc2017_64\bin;D:\a\yubioath-desktop\yubioath-desktop;%PATH% call C:\"Program Files (x86)\Microsoft Visual Studio"\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat x64 qmake jom @@ -75,7 +75,7 @@ jobs: - name: Run windeployqt run: | - set PATH=D:\a\yubioath-desktop\yubioath-desktop\5.14.0\msvc2017_64\bin;D:\a\yubioath-desktop\yubioath-desktop;%PATH% + set PATH=D:\a\yubioath-desktop\yubioath-desktop\5.14.1\msvc2017_64\bin;D:\a\yubioath-desktop\yubioath-desktop;%PATH% call C:\"Program Files (x86)\Microsoft Visual Studio"\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat x64 windeployqt .\release\yubioath-desktop.exe --qmldir=qml --no-translations --angle --release shell: cmd diff --git a/.github/workflows/windows-x86.yml b/.github/workflows/windows-x86.yml index 446a827a..e6be9b43 100644 --- a/.github/workflows/windows-x86.yml +++ b/.github/workflows/windows-x86.yml @@ -43,7 +43,7 @@ jobs: - name: Install Qt and Jom run: | pip install aqtinstall==0.6 - python -m aqt install 5.14.0 windows desktop win32_msvc2017 + python -m aqt install 5.14.1 windows desktop win32_msvc2017 7z x jom.zip shell: powershell @@ -58,7 +58,7 @@ jobs: - name: Build and install pyotherside run: | - set PATH=D:\a\yubioath-desktop\yubioath-desktop\5.14.0\msvc2017\bin;D:\a\yubioath-desktop\yubioath-desktop;%PATH% + set PATH=D:\a\yubioath-desktop\yubioath-desktop\5.14.1\msvc2017\bin;D:\a\yubioath-desktop\yubioath-desktop;%PATH% call C:\"Program Files (x86)\Microsoft Visual Studio"\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat x86 cd pyotherside-%PYOTHERSIDE_VER% qmake @@ -68,7 +68,7 @@ jobs: - name: Build app run: | - set PATH=C:\hostedtoolcache\windows\Python\$env:PYTHON_VER\x86\Scripts;C:\hostedtoolcache\windows\Python\$env:PYTHON_VER\x86;D:\a\yubioath-desktop\yubioath-desktop\5.14.0\msvc2017\bin;D:\a\yubioath-desktop\yubioath-desktop;%PATH% + set PATH=C:\hostedtoolcache\windows\Python\$env:PYTHON_VER\x86\Scripts;C:\hostedtoolcache\windows\Python\$env:PYTHON_VER\x86;D:\a\yubioath-desktop\yubioath-desktop\5.14.1\msvc2017\bin;D:\a\yubioath-desktop\yubioath-desktop;%PATH% call C:\"Program Files (x86)\Microsoft Visual Studio"\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat x86 qmake jom @@ -76,7 +76,7 @@ jobs: - name: Run windeployqt run: | - set PATH=D:\a\yubioath-desktop\yubioath-desktop\5.14.0\msvc2017\bin;D:\a\yubioath-desktop\yubioath-desktop;%PATH% + set PATH=D:\a\yubioath-desktop\yubioath-desktop\5.14.1\msvc2017\bin;D:\a\yubioath-desktop\yubioath-desktop;%PATH% call C:\"Program Files (x86)\Microsoft Visual Studio"\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat x86 windeployqt .\release\yubioath-desktop.exe --qmldir=.\qml --no-translations --angle --release shell: cmd