diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2ac4994..1e6a7bf 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -39,20 +39,6 @@ jobs: TARGET: ios ARCH: ios ARCHDIR: ios - QT 5.13.0 mac android android_x86: - PYTHON_VERSION: '3.7' - QT_VERSION: 5.13.0 - HOST: mac - TARGET: android - ARCH: android_x86 - ARCHDIR: android_x86 - QT 5.13.0 mac android android_armv7: - PYTHON_VERSION: '3.7' - QT_VERSION: 5.13.0 - HOST: mac - TARGET: android - ARCH: android_armv7 - ARCHDIR: android_armv7 - job: Windows pool: vmImage: vs2017-win2016 @@ -123,20 +109,6 @@ jobs: TARGET: desktop ARCH: win32_mingw73 ARCHDIR: mingw73_32 - QT 5.13.0 windows android android_x86: - PYTHON_VERSION: '3.7' - QT_VERSION: 5.13.0 - HOST: windows - TARGET: android - ARCH: android_x86 - ARCHDIR: android_x86 - QT 5.13.0 windows android android_armv7: - PYTHON_VERSION: '3.7' - QT_VERSION: 5.13.0 - HOST: windows - TARGET: android - ARCH: android_armv7 - ARCHDIR: android_armv7 - job: Linux pool: vmImage: ubuntu-16.04 diff --git a/generate_azure_pipelines_yml.py b/generate_azure_pipelines_yml.py index bea903b..4da471f 100644 --- a/generate_azure_pipelines_yml.py +++ b/generate_azure_pipelines_yml.py @@ -88,13 +88,15 @@ windows_build_jobs.extend( ] ) -# All Androids for all platforms +# Androids for Linux platforms +# aqt is for CI/CD systems! +# Users might develop on Win/Mac, but are most likely to use Linux for CI/CD with +# the Android ecosystem. -for android_arch in [ 'android_x86', 'android_armv7', ]: - for platform_build_jobs in all_platform_build_jobs: - platform_build_jobs.build_jobs.append( - BuildJob('5.13.0', platform_build_jobs.platform, 'android', android_arch, android_arch) - ) +for android_arch in ['android_x86', 'android_armv7']: + linux_build_jobs.append( + BuildJob('5.13.0', 'linux', 'android', android_arch, android_arch) + ) matrices = {}