Mirrors/aqtinstall
1
0
Fork 0
mirror of https://github.com/miurahr/aqtinstall.git synced 2025-12-18 05:04:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

CI: update azure-pipelines to new syntax

Browse Source 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
This commit is contained in:
Hiroshi Miura
2021-08-01 19:53:58 +09:00
parent 59b8522cd2
commit 67aa6365bc
2 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
ci/generate_azure_pipelines_matrices.py
View File

@@ -70,20 +70,20 @@ all_platform_build_jobs = [
# Linux Desktop # Linux Desktop
for qt_version in qt_versions: for qt_version in qt_versions:
linux_build_jobs.append( linux_build_jobs.append(
BuildJob("install", qt_version, "linux", "desktop", "gcc_64", "gcc_64") BuildJob("install-qt", qt_version, "linux", "desktop", "gcc_64", "gcc_64")
) )
# Mac Desktop # Mac Desktop
for qt_version in qt_versions: for qt_version in qt_versions:
mac_build_jobs.append( mac_build_jobs.append(
BuildJob("install", qt_version, "mac", "desktop", "clang_64", "clang_64") BuildJob("install-qt", qt_version, "mac", "desktop", "clang_64", "clang_64")
) )
# Windows Desktop # Windows Desktop
windows_build_jobs.extend( windows_build_jobs.extend(
[ [
BuildJob( BuildJob(
"install", "install-qt",
"5.14.2", "5.14.2",
"windows", "windows",
"desktop", "desktop",
@@ -92,7 +92,7 @@ windows_build_jobs.extend(
mirror=random.choice(MIRRORS), mirror=random.choice(MIRRORS),
), ),
BuildJob( BuildJob(
"install", "install-qt",
"5.14.2", "5.14.2",
"windows", "windows",
"desktop", "desktop",
@@ -101,7 +101,7 @@ windows_build_jobs.extend(
mirror=random.choice(MIRRORS), mirror=random.choice(MIRRORS),
), ),
BuildJob( BuildJob(
"install", "install-qt",
"5.13.2", "5.13.2",
"windows", "windows",
"desktop", "desktop",
@@ -110,7 +110,7 @@ windows_build_jobs.extend(
mirror=random.choice(MIRRORS), mirror=random.choice(MIRRORS),
), ),
BuildJob( BuildJob(
"install", "install-qt",
"5.15.2", "5.15.2",
"windows", "windows",
"desktop", "desktop",
@@ -121,7 +121,7 @@ windows_build_jobs.extend(
# Known issue with Azure-Pipelines environment: it has a pre-installed mingw81 which cause link error. # Known issue with Azure-Pipelines environment: it has a pre-installed mingw81 which cause link error.
# BuildJob('install', '5.15.0', 'windows', 'desktop', 'win32_mingw81', 'mingw81_32', mirror=MIRROR), # BuildJob('install', '5.15.0', 'windows', 'desktop', 'win32_mingw81', 'mingw81_32', mirror=MIRROR),
BuildJob( BuildJob(
"install", "install-qt",
"5.15.2", "5.15.2",
"windows", "windows",
"desktop", "desktop",
@@ -137,7 +137,7 @@ windows_build_jobs.extend(
linux_build_jobs.extend( linux_build_jobs.extend(
[ [
BuildJob( BuildJob(
"install", "install-qt",
"5.15.2", "5.15.2",
"linux", "linux",
"desktop", "desktop",
@@ -146,10 +146,10 @@ linux_build_jobs.extend(
module="qtcharts qtnetworkauth", module="qtcharts qtnetworkauth",
), ),
BuildJob( BuildJob(
"install", "5.14.2", "linux", "desktop", "gcc_64", "gcc_64", module="all" "install-qt", "5.14.2", "linux", "desktop", "gcc_64", "gcc_64", module="all"
), ),
BuildJob( BuildJob(
"install", "install-qt",
"5.15.2", "5.15.2",
"linux", "linux",
"desktop", "desktop",
@@ -158,28 +158,28 @@ linux_build_jobs.extend(
subarchives="qtbase qttools qt icu", subarchives="qtbase qttools qt icu",
), ),
BuildJob( BuildJob(
"src", "6.1.0", "linux", "desktop", "gcc_64", "gcc_64", subarchives="qt" "install-src", "6.1.0", "linux", "desktop", "gcc_64", "gcc_64", subarchives="qt"
), ),
BuildJob( BuildJob(
"doc", "6.1.0", "linux", "desktop", "gcc_64", "gcc_64", subarchives="qtdoc" "install-doc", "6.1.0", "linux", "desktop", "gcc_64", "gcc_64", subarchives="qtdoc"
), ),
# test for list commands # test for list commands
BuildJob('list', '5.15.2', 'linux', 'desktop', '', '', spec="<6", list_options={ BuildJob('list-qt', '5.15.2', 'linux', 'desktop', '', '', spec="<6", list_options={
'HAS_EXTENSIONS': "True", 'HAS_EXTENSIONS': "True",
}), }),
BuildJob('list', '6.1.0', 'linux', 'android', '', '', spec=">6.0,<6.1.1", list_options={ BuildJob('list-qt', '6.1.0', 'linux', 'android', '', '', spec=">6.0,<6.1.1", list_options={
'HAS_EXTENSIONS': "True", 'HAS_EXTENSIONS': "True",
'USE_EXTENSION': "armv7", 'USE_EXTENSION': "armv7",
}), }),
# tests run on linux but query data about other platforms # tests run on linux but query data about other platforms
BuildJob('list', '5.14.1', 'mac', 'ios', '', '', spec="<=5.14.1", list_options={}), BuildJob('list-qt', '5.14.1', 'mac', 'ios', '', '', spec="<=5.14.1", list_options={}),
BuildJob('list', '5.13.1', 'windows', 'winrt', '', '', spec=">5.13.0,<5.13.2", list_options={}), BuildJob('list-qt', '5.13.1', 'windows', 'winrt', '', '', spec=">5.13.0,<5.13.2", list_options={}),
] ]
) )
mac_build_jobs.extend( mac_build_jobs.extend(
[ [
BuildJob( BuildJob(
"install", "install-qt",
"6.2.0", "6.2.0",
"mac", "mac",
"desktop", "desktop",
@@ -188,7 +188,7 @@ mac_build_jobs.extend(
module="addons.qtcharts addons.qtnetworkauth", module="addons.qtcharts addons.qtnetworkauth",
), ),
BuildJob( BuildJob(
"install", "install-qt",
"5.14.2", "5.14.2",
"mac", "mac",
"desktop", "desktop",
@@ -201,23 +201,23 @@ mac_build_jobs.extend(
# WASM # WASM
linux_build_jobs.append( linux_build_jobs.append(
BuildJob("install", "5.14.2", "linux", "desktop", "wasm_32", "wasm_32") BuildJob("install-qt", "5.14.2", "linux", "desktop", "wasm_32", "wasm_32")
) )
mac_build_jobs.append( mac_build_jobs.append(
BuildJob("install", "5.14.2", "mac", "desktop", "wasm_32", "wasm_32") BuildJob("install-qt", "5.14.2", "mac", "desktop", "wasm_32", "wasm_32")
) )
# mobile SDK # mobile SDK
mac_build_jobs.extend( mac_build_jobs.extend(
[ [
BuildJob("install", "5.15.2", "mac", "ios", "ios", "ios"), BuildJob("install-qt", "5.15.2", "mac", "ios", "ios", "ios"),
BuildJob( BuildJob(
"install", "6.1.0", "mac", "android", "android_armv7", "android_armv7" "install-qt", "6.1.0", "mac", "android", "android_armv7", "android_armv7"
), ),
] ]
) )
linux_build_jobs.extend( linux_build_jobs.extend(
[BuildJob("install", "6.1.0", "linux", "android", "android_armv7", "android_armv7")] [BuildJob("install-qt", "6.1.0", "linux", "android", "android_armv7", "android_armv7")]
) )
# Test binary patch of qmake # Test binary patch of qmake
@@ -226,7 +226,7 @@ linux_build_jobs.extend(
# New output dir is shorter than the default value; qmake could fail to # New output dir is shorter than the default value; qmake could fail to
# locate prefix dir if the value is patched wrong # locate prefix dir if the value is patched wrong
BuildJob( BuildJob(
"install", "install-qt",
"5.12.11", "5.12.11",
"linux", "linux",
"desktop", "desktop",
@@ -237,7 +237,7 @@ linux_build_jobs.extend(
# New output dir is longer than the default value. # New output dir is longer than the default value.
# This case is meant to work without any bugfix; if this fails, the test is setup wrong # This case is meant to work without any bugfix; if this fails, the test is setup wrong
BuildJob( BuildJob(
"install", "install-qt",
"5.12.11", "5.12.11",
"linux", "linux",
"desktop", "desktop",

22
ci/steps.yml
View File

@@ -19,7 +19,7 @@ steps:
sleep $number sleep $number
mkdir Qt mkdir Qt
cd Qt cd Qt
if [[ "$(SUBCOMMAND)" == "install" ]]; then if [[ "$(SUBCOMMAND)" == "install-qt" ]]; then
opt="" opt=""
if [[ "$(QT_BASE_MIRROR)" != "" ]]; then if [[ "$(QT_BASE_MIRROR)" != "" ]]; then
opt+=" -b $(QT_BASE_MIRROR)" opt+=" -b $(QT_BASE_MIRROR)"
@@ -35,12 +35,12 @@ steps:
if [[ "$(SUBARCHIVES)" != "" ]]; then if [[ "$(SUBARCHIVES)" != "" ]]; then
opt+=" --archives $(SUBARCHIVES)" opt+=" --archives $(SUBARCHIVES)"
fi fi
python -m aqt install $(QT_VERSION) $(HOST) $(TARGET) $(ARCH) $opt python -m aqt install-qt $(QT_VERSION) $(HOST) $(TARGET) $(ARCH) $opt
if [[ "$(TARGET)" == "android" || "$(TARGET)" == "ios" ]]; then if [[ "$(TARGET)" == "android" || "$(TARGET)" == "ios" ]]; then
if [[ "$(HOST)" == "windows" ]]; then if [[ "$(HOST)" == "windows" ]]; then
python -m aqt install $(QT_VERSION) $(HOST) desktop mingw81_64 --archives qtbase python -m aqt install-qt $(QT_VERSION) $(HOST) desktop mingw81_64 --archives qtbase
else else
python -m aqt install $(QT_VERSION) $(HOST) desktop --archives qtbase python -m aqt install-qt $(QT_VERSION) $(HOST) desktop --archives qtbase
fi fi
fi fi
if [[ "$(OUTPUT_DIR)" != "" ]]; then if [[ "$(OUTPUT_DIR)" != "" ]]; then
@@ -98,10 +98,10 @@ steps:
aqt list-qt $(HOST) $(TARGET) $ext --arch $(QT_VERSION) # print architectures for version/host/target aqt list-qt $(HOST) $(TARGET) $ext --arch $(QT_VERSION) # print architectures for version/host/target
aqt list-qt $(HOST) $(TARGET) $ext --spec "$(SPEC)" --arch latest aqt list-qt $(HOST) $(TARGET) $ext --spec "$(SPEC)" --arch latest
fi fi
if [[ "$(SUBCOMMAND)" == "src" ]]; then if [[ "$(SUBCOMMAND)" == "install-src" ]]; then
python -m aqt $(SUBCOMMAND) $(QT_VERSION) $(HOST) $(TARGET) --archives $(SUBARCHIVES) python -m aqt $(SUBCOMMAND) $(QT_VERSION) $(HOST) $(TARGET) --archives $(SUBARCHIVES)
fi fi
if [[ "$(SUBCOMMAND)" == "doc" ]]; then if [[ "$(SUBCOMMAND)" == "install-doc" ]]; then
python -m aqt $(SUBCOMMAND) $(QT_VERSION) $(HOST) $(TARGET) --archives $(SUBARCHIVES) python -m aqt $(SUBCOMMAND) $(QT_VERSION) $(HOST) $(TARGET) --archives $(SUBARCHIVES)
fi fi
workingDirectory: $(Build.BinariesDirectory) workingDirectory: $(Build.BinariesDirectory)
@@ -128,13 +128,13 @@ steps:
export PATH=$(QT_BINDIR):$PATH export PATH=$(QT_BINDIR):$PATH
qmake $(Build.BinariesDirectory)/tests/accelbubble qmake $(Build.BinariesDirectory)/tests/accelbubble
make make
condition: and(eq(variables['TARGET'], 'android'), or(eq(variables['Agent.OS'], 'Linux'), eq(variables['Agent.OS'], 'Darwin')), ne(variables['SUBCOMMAND'], 'list')) condition: and(eq(variables['TARGET'], 'android'), or(eq(variables['Agent.OS'], 'Linux'), eq(variables['Agent.OS'], 'Darwin')), ne(variables['SUBCOMMAND'], 'list-qt'))
displayName: Build accelbubble example application to test for android displayName: Build accelbubble example application to test for android
- script: | - script: |
sudo apt-get update sudo apt-get update
sudo apt-get install -y libgl1-mesa-dev sudo apt-get install -y libgl1-mesa-dev
condition: and(eq(variables['TARGET'], 'desktop'), eq(variables['Agent.OS'], 'Linux'), eq(variables['SUBCOMMAND'], 'install')) condition: and(eq(variables['TARGET'], 'desktop'), eq(variables['Agent.OS'], 'Linux'), eq(variables['SUBCOMMAND'], 'install-qt'))
displayName: install test dependency for Linux displayName: install test dependency for Linux
##---------------------------------------------------- ##----------------------------------------------------
@@ -176,7 +176,7 @@ steps:
export PATH=$(QT_BINDIR):$PATH export PATH=$(QT_BINDIR):$PATH
qmake $(Build.BinariesDirectory)/tests/helloworld qmake $(Build.BinariesDirectory)/tests/helloworld
make make
condition: and(eq( variables['TARGET'], 'desktop' ), ne( variables['ARCH'], 'wasm_32' ), or(eq(variables['Agent.OS'], 'Linux'), eq(variables['Agent.OS'], 'Darwin')), eq(variables['MODULE'], ''), eq(variables['SUBCOMMAND'], 'install')) condition: and(eq( variables['TARGET'], 'desktop' ), ne( variables['ARCH'], 'wasm_32' ), or(eq(variables['Agent.OS'], 'Linux'), eq(variables['Agent.OS'], 'Darwin')), eq(variables['MODULE'], ''), eq(variables['SUBCOMMAND'], 'install-qt'))
displayName: Build test with qmake for Linux and macOS w/o extra module displayName: Build test with qmake for Linux and macOS w/o extra module
- powershell: | - powershell: |
if ( $env:TOOLCHAIN -eq 'MSVC' ) { if ( $env:TOOLCHAIN -eq 'MSVC' ) {
@@ -190,10 +190,10 @@ steps:
jom jom
} elseif ( $env:TOOLCHAIN -eq 'MINGW' ) { } elseif ( $env:TOOLCHAIN -eq 'MINGW' ) {
if ( $env:ARCH -eq 'win64_mingw81' ) { if ( $env:ARCH -eq 'win64_mingw81' ) {
python -m aqt tool --outputdir $(Build.BinariesDirectory)/Qt $(HOST) desktop tools_mingw qt.tools.win64_mingw810 python -m aqt install-tool --outputdir $(Build.BinariesDirectory)/Qt $(HOST) desktop tools_mingw qt.tools.win64_mingw810
[Environment]::SetEnvironmentVariable("Path", ";$(Build.BinariesDirectory)\Qt\Tools\mingw810_64\bin" + $env:Path, "Machine") [Environment]::SetEnvironmentVariable("Path", ";$(Build.BinariesDirectory)\Qt\Tools\mingw810_64\bin" + $env:Path, "Machine")
} else { } else {
python -m aqt tool --outputdir $(Build.BinariesDirectory)/Qt $(HOST) desktop tools_mingw qt.tools.win32_mingw810 python -m aqt install-tool --outputdir $(Build.BinariesDirectory)/Qt $(HOST) desktop tools_mingw qt.tools.win32_mingw810
[Environment]::SetEnvironmentVariable("Path", ";$(Build.BinariesDirectory)\Qt\Tools\mingw810_32\bin" + $env:Path, "Machine") [Environment]::SetEnvironmentVariable("Path", ";$(Build.BinariesDirectory)\Qt\Tools\mingw810_32\bin" + $env:Path, "Machine")
} }
$env:Path = "$(Build.BinariesDirectory)\Qt\Tools\$(ARCHDIR)\bin;$(WIN_QT_BINDIR);" + $env:Path $env:Path = "$(Build.BinariesDirectory)\Qt\Tools\$(ARCHDIR)\bin;$(WIN_QT_BINDIR);" + $env:Path