Yubico/yubioath-flutter
1
1
Fork 0
mirror of https://github.com/Yubico/yubioath-flutter.git synced 2024-11-25 05:52:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #533 from Yubico/qt-updates

Browse Source 
actions: make sure to use qt 5.14.1 on macOS and windows
This commit is contained in:
Dag Heyman 2020-01-31 09:14:44 +01:00 committed by GitHub
commit 299bfdb7c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/macOS.yml vendored
View File

@ -18,6 +18,7 @@ jobs:
- name: Install dependencies from hombrew
run: |
brew update
brew upgrade
brew bundle --file=./.github/workflows/Brewfile
brew link qt -f

8
.github/workflows/windows-x64.yml vendored
View File

@ -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

8
.github/workflows/windows-x86.yml vendored
View File

@ -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