mirror of
https://github.com/miurahr/aqtinstall.git
synced 2025-12-16 20:27:05 +03:00
Handle Qt6/non-desktop installation patching (#210)
* Do not check qmake for android Signed-off-by: Hiroshi Miura <miurahr@linux.com> * Refactoring patching Signed-off-by: Hiroshi Miura <miurahr@linux.com> * CI: test android_armv7 in 6.0.1 Signed-off-by: Hiroshi Miura <miurahr@linux.com> * Patching qt6 android qmake script Signed-off-by: Hiroshi Miura <miurahr@linux.com> * Patching qt6 android qmake script(wip) Signed-off-by: Hiroshi Miura <miurahr@linux.com> * CI: test android/qt6 on github actions Signed-off-by: Hiroshi Miura <miurahr@linux.com> * Add combination for Qt6 and update README Signed-off-by: Hiroshi Miura <miurahr@linux.com> * CI: Azure: Fix test cases Signed-off-by: Hiroshi Miura <miurahr@linux.com> * CI: Azure: Fix Qt6 test case Signed-off-by: Hiroshi Miura <miurahr@linux.com> * CI: Fix windows case Signed-off-by: Hiroshi Miura <miurahr@linux.com> * CI: Fix windows case Add debug print Signed-off-by: Hiroshi Miura <miurahr@linux.com> * Fix prefix path for patching Signed-off-by: Hiroshi Miura <miurahr@linux.com> * Improvve log messages for patching Signed-off-by: Hiroshi Miura <miurahr@linux.com> * CI: Check android installation Signed-off-by: Hiroshi Miura <miurahr@linux.com> * CI: Check android installation Signed-off-by: Hiroshi Miura <miurahr@linux.com> * CI: Check android installation Signed-off-by: Hiroshi Miura <miurahr@linux.com> * Updater: update logging message Signed-off-by: Hiroshi Miura <miurahr@linux.com> * Updater: Fix qmake detection on windows Signed-off-by: Hiroshi Miura <miurahr@linux.com> * CI: run qmake.bat on windows Signed-off-by: Hiroshi Miura <miurahr@linux.com> * CI: run Qt6 qmake.bat on windows Signed-off-by: Hiroshi Miura <miurahr@linux.com> * CI: run Qt6 qmake.bat on windows Signed-off-by: Hiroshi Miura <miurahr@linux.com> * CI: Azure: fix mirror test Signed-off-by: Hiroshi Miura <miurahr@linux.com> * CI: Azure: test Qt6 with Ubuntu 20.04 Signed-off-by: Hiroshi Miura <miurahr@linux.com>
This commit is contained in:
@@ -62,14 +62,14 @@ jobs:
|
||||
displayName: Linux (Specific Mirror)
|
||||
variables:
|
||||
PYTHON_VERSION: '3.8'
|
||||
QT_VERSION: 5.13.1
|
||||
QT_VERSION: 6.1.0
|
||||
HOST: linux
|
||||
TARGET: android
|
||||
ARCH: android_armv7
|
||||
ARCHDIR: android_armv7
|
||||
TARGET: desktop
|
||||
ARCH: gcc_64
|
||||
ARCHDIR: gcc_64
|
||||
QT_BASE_MIRROR: http://mirrors.ocf.berkeley.edu/qt/
|
||||
pool:
|
||||
vmImage: 'ubuntu-18.04'
|
||||
vmImage: 'ubuntu-20.04'
|
||||
steps:
|
||||
- template: ci/steps.yml
|
||||
|
||||
|
||||
Reference in New Issue
Block a user