azure: more reduction of workloads

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
This commit is contained in:
Hiroshi Miura
2019-05-25 17:24:07 +09:00
parent b6bd7843d3
commit 658ea7cf42
2 changed files with 107 additions and 139 deletions

View File

@@ -11,48 +11,48 @@ jobs:
- template: ci/steps.yml
strategy:
matrix:
Python 3.7 QT 5.13.0 mac android android_x86:
ARCH: android_x86
QT_VERSION: 5.13.0
ARCHDIR: android_x86
PYTHON_VERSION: '3.7'
TARGET: android
HOST: mac
Python 3.7 QT 5.13.0 mac android android_armv7:
ARCH: android_armv7
QT_VERSION: 5.13.0
ARCHDIR: android_armv7
PYTHON_VERSION: '3.7'
TARGET: android
HOST: mac
Python 3.7 QT 5.13.0 mac desktop clang_64:
ARCH: clang_64
QT_VERSION: 5.13.0
ARCHDIR: clang_64
PYTHON_VERSION: '3.7'
TARGET: desktop
HOST: mac
Python 3.7 QT 5.12.3 mac desktop clang_64:
ARCH: clang_64
QT_VERSION: 5.12.3
ARCHDIR: clang_64
PYTHON_VERSION: '3.7'
TARGET: desktop
HOST: mac
Python 3.7 QT 5.13.0 mac ios ios:
ARCH: ios
QT_VERSION: 5.13.0
ARCHDIR: ios
PYTHON_VERSION: '3.7'
TARGET: ios
HOST: mac
Python 3.7 QT 5.11.3 mac desktop clang_64:
ARCH: clang_64
QT 5.11.3 mac desktop clang_64:
QT_VERSION: 5.11.3
ARCHDIR: clang_64
PYTHON_VERSION: '3.7'
TARGET: desktop
PYTHON_VERSION: '3.7'
ARCHDIR: clang_64
HOST: mac
ARCH: clang_64
QT 5.13.0 mac android android_x86:
QT_VERSION: 5.13.0
TARGET: android
PYTHON_VERSION: '3.7'
ARCHDIR: android_x86
HOST: mac
ARCH: android_x86
QT 5.12.3 mac desktop clang_64:
QT_VERSION: 5.12.3
TARGET: desktop
PYTHON_VERSION: '3.7'
ARCHDIR: clang_64
HOST: mac
ARCH: clang_64
QT 5.13.0 mac desktop clang_64:
QT_VERSION: 5.13.0
TARGET: desktop
PYTHON_VERSION: '3.7'
ARCHDIR: clang_64
HOST: mac
ARCH: clang_64
QT 5.13.0 mac ios ios:
QT_VERSION: 5.13.0
TARGET: ios
PYTHON_VERSION: '3.7'
ARCHDIR: ios
HOST: mac
ARCH: ios
QT 5.13.0 mac android android_armv7:
QT_VERSION: 5.13.0
TARGET: android
PYTHON_VERSION: '3.7'
ARCHDIR: android_armv7
HOST: mac
ARCH: android_armv7
- job: Windows
pool:
vmImage: vs2017-win2016
@@ -60,83 +60,55 @@ jobs:
- template: ci/steps.yml
strategy:
matrix:
Python 3.7 QT 5.13.0 windows desktop win64_mingw73:
ARCH: win64_mingw73
QT_VERSION: 5.13.0
ARCHDIR: mingw73
PYTHON_VERSION: '3.7'
TARGET: desktop
HOST: windows
Python 3.7 QT 5.13.0 windows desktop win64_msvc2017_64:
ARCH: win64_msvc2017_64
QT_VERSION: 5.13.0
ARCHDIR: msvc2017_64
PYTHON_VERSION: '3.7'
TARGET: desktop
HOST: windows
Python 3.7 QT 5.13.0 windows android android_x86:
ARCH: android_x86
QT_VERSION: 5.13.0
ARCHDIR: android_x86
PYTHON_VERSION: '3.7'
TARGET: android
HOST: windows
Python 3.7 QT 5.13.0 windows desktop win32_mingw73:
ARCH: win32_mingw73
QT_VERSION: 5.13.0
ARCHDIR: mingw73
PYTHON_VERSION: '3.7'
TARGET: desktop
HOST: windows
Python 3.7 QT 5.11.3 windows desktop win64_msvc2017_64:
ARCH: win64_msvc2017_64
QT 5.11.3 windows desktop win32_msvc2015:
QT_VERSION: 5.11.3
ARCHDIR: msvc2017_64
PYTHON_VERSION: '3.7'
TARGET: desktop
HOST: windows
Python 3.7 QT 5.13.0 windows android android_armv7:
ARCH: android_armv7
QT_VERSION: 5.13.0
ARCHDIR: android_armv7
PYTHON_VERSION: '3.7'
TARGET: android
HOST: windows
Python 3.7 QT 5.12.3 windows desktop win64_msvc2017_64:
ARCH: win64_msvc2017_64
QT_VERSION: 5.12.3
ARCHDIR: msvc2017_64
PYTHON_VERSION: '3.7'
TARGET: desktop
HOST: windows
Python 3.7 QT 5.12.3 windows desktop win32_msvc2017:
ARCH: win32_msvc2017
QT_VERSION: 5.12.3
ARCHDIR: msvc2017
PYTHON_VERSION: '3.7'
TARGET: desktop
HOST: windows
Python 3.7 QT 5.13.0 windows desktop win64_msvc2015_64:
ARCH: win64_msvc2015_64
QT_VERSION: 5.13.0
ARCHDIR: msvc2015_64
PYTHON_VERSION: '3.7'
TARGET: desktop
HOST: windows
Python 3.7 QT 5.11.3 windows desktop win32_msvc2015:
ARCH: win32_msvc2015
QT_VERSION: 5.11.3
ARCHDIR: msvc2015
PYTHON_VERSION: '3.7'
TARGET: desktop
HOST: windows
Python 3.7 QT 5.13.0 windows desktop win32_msvc2017:
ARCH: win32_msvc2017
ARCH: win32_msvc2015
QT 5.13.0 windows android android_x86:
QT_VERSION: 5.13.0
ARCHDIR: msvc2017
TARGET: android
PYTHON_VERSION: '3.7'
TARGET: desktop
ARCHDIR: android_x86
HOST: windows
ARCH: android_x86
QT 5.13.0 windows android android_armv7:
QT_VERSION: 5.13.0
TARGET: android
PYTHON_VERSION: '3.7'
ARCHDIR: android_armv7
HOST: windows
ARCH: android_armv7
QT 5.12.3 windows desktop win64_msvc2017_64:
QT_VERSION: 5.12.3
TARGET: desktop
PYTHON_VERSION: '3.7'
ARCHDIR: msvc2017_64
HOST: windows
ARCH: win64_msvc2017_64
QT 5.13.0 windows desktop win64_msvc2017_64:
QT_VERSION: 5.13.0
TARGET: desktop
PYTHON_VERSION: '3.7'
ARCHDIR: msvc2017_64
HOST: windows
ARCH: win64_msvc2017_64
QT 5.13.0 windows desktop win64_mingw73:
QT_VERSION: 5.13.0
TARGET: desktop
PYTHON_VERSION: '3.7'
ARCHDIR: mingw73
HOST: windows
ARCH: win64_mingw73
QT 5.13.0 windows desktop win32_msvc2017:
QT_VERSION: 5.13.0
TARGET: desktop
PYTHON_VERSION: '3.7'
ARCHDIR: msvc2017
HOST: windows
ARCH: win32_msvc2017
- job: Linux
pool:
vmImage: ubuntu-16.04
@@ -144,38 +116,38 @@ jobs:
- template: ci/steps.yml
strategy:
matrix:
Python 3.7 QT 5.11.3 linux desktop gcc_64:
ARCH: gcc_64
QT 5.11.3 linux desktop gcc_64:
QT_VERSION: 5.11.3
ARCHDIR: gcc_64
PYTHON_VERSION: '3.7'
TARGET: desktop
PYTHON_VERSION: '3.7'
ARCHDIR: gcc_64
HOST: linux
Python 3.7 QT 5.13.0 linux desktop gcc_64:
ARCH: gcc_64
QT 5.13.0 linux android android_armv7:
QT_VERSION: 5.13.0
ARCHDIR: gcc_64
PYTHON_VERSION: '3.7'
TARGET: desktop
HOST: linux
Python 3.7 QT 5.13.0 linux android android_x86:
ARCH: android_x86
QT_VERSION: 5.13.0
ARCHDIR: android_x86
PYTHON_VERSION: '3.7'
TARGET: android
HOST: linux
Python 3.7 QT 5.13.0 linux android android_armv7:
ARCH: android_armv7
QT_VERSION: 5.13.0
PYTHON_VERSION: '3.7'
ARCHDIR: android_armv7
PYTHON_VERSION: '3.7'
TARGET: android
HOST: linux
Python 3.7 QT 5.12.3 linux desktop gcc_64:
ARCH: gcc_64
QT_VERSION: 5.12.3
ARCHDIR: gcc_64
PYTHON_VERSION: '3.7'
ARCH: android_armv7
QT 5.13.0 linux desktop gcc_64:
QT_VERSION: 5.13.0
TARGET: desktop
PYTHON_VERSION: '3.7'
ARCHDIR: gcc_64
HOST: linux
ARCH: gcc_64
QT 5.13.0 linux android android_x86:
QT_VERSION: 5.13.0
TARGET: android
PYTHON_VERSION: '3.7'
ARCHDIR: android_x86
HOST: linux
ARCH: android_x86
QT 5.12.3 linux desktop gcc_64:
QT_VERSION: 5.12.3
TARGET: desktop
PYTHON_VERSION: '3.7'
ARCHDIR: gcc_64
HOST: linux
ARCH: gcc_64

View File

@@ -64,7 +64,6 @@ mac_build_jobs.append(
# Windows Desktop
windows_build_jobs.extend(
[
BuildJob('5.11.3', 'windows', 'desktop', 'win64_msvc2017_64', 'msvc2017_64'),
BuildJob('5.11.3', 'windows', 'desktop', 'win32_msvc2015', 'msvc2015'),
]
)
@@ -72,17 +71,14 @@ windows_build_jobs.extend(
windows_build_jobs.extend(
[
BuildJob('5.12.3', 'windows', 'desktop', 'win64_msvc2017_64', 'msvc2017_64'),
BuildJob('5.12.3', 'windows', 'desktop', 'win32_msvc2017', 'msvc2017'),
]
)
windows_build_jobs.extend(
[
BuildJob('5.13.0', 'windows', 'desktop', 'win64_msvc2017_64', 'msvc2017_64'),
BuildJob('5.13.0', 'windows', 'desktop', 'win64_msvc2015_64', 'msvc2015_64'),
BuildJob('5.13.0', 'windows', 'desktop', 'win64_mingw73', 'mingw73'),
BuildJob('5.13.0', 'windows', 'desktop', 'win32_msvc2017', 'msvc2017'),
BuildJob('5.13.0', 'windows', 'desktop', 'win32_mingw73', 'mingw73'),
BuildJob('5.13.0', 'windows', 'desktop', 'win64_mingw73', 'mingw73'),
]
)
@@ -101,7 +97,7 @@ for platform_build_job in all_platform_build_jobs:
'matrix': {}
}
for build_job, python_version in product(platform_build_job.build_jobs, python_versions):
key = 'Python {} QT {} {} {} {}'.format(python_version, build_job.qt_version, build_job.host, build_job.target,
key = 'QT {} {} {} {}'.format(build_job.qt_version, build_job.host, build_job.target,
build_job.arch)
yaml_dictionary['matrix'][key] = \
{