diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a23d3bf..d9c69be 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -11,90 +11,48 @@ jobs: - template: ci/steps.yml strategy: matrix: - Python 3.6 QT 5.12.3 mac desktop clang_64: - TARGET: desktop - ARCHDIR: clang_64 - QT_VERSION: 5.12.3 - HOST: mac - PYTHON_VERSION: '3.6' - ARCH: clang_64 - Python 3.6 QT 5.13.0 mac ios ios: - TARGET: ios - ARCHDIR: ios - QT_VERSION: 5.13.0 - HOST: mac - PYTHON_VERSION: '3.6' - ARCH: ios - Python 3.6 QT 5.13.0 mac android android_x86: - TARGET: android - ARCHDIR: android_x86 - QT_VERSION: 5.13.0 - HOST: mac - PYTHON_VERSION: '3.6' - ARCH: android_x86 - Python 3.6 QT 5.13.0 mac android android_armv7: - TARGET: android - ARCHDIR: android_armv7 - QT_VERSION: 5.13.0 - HOST: mac - PYTHON_VERSION: '3.6' - ARCH: android_armv7 - Python 3.7 QT 5.13.0 mac ios ios: - TARGET: ios - ARCHDIR: ios - QT_VERSION: 5.13.0 - HOST: mac - PYTHON_VERSION: '3.7' - ARCH: ios - Python 3.7 QT 5.13.0 mac android android_armv7: - TARGET: android - ARCHDIR: android_armv7 - QT_VERSION: 5.13.0 - HOST: mac - PYTHON_VERSION: '3.7' - ARCH: android_armv7 - Python 3.6 QT 5.11.3 mac desktop clang_64: - TARGET: desktop - ARCHDIR: clang_64 - QT_VERSION: 5.11.3 - HOST: mac - PYTHON_VERSION: '3.6' - ARCH: clang_64 - Python 3.7 QT 5.12.3 mac desktop clang_64: - TARGET: desktop - ARCHDIR: clang_64 - QT_VERSION: 5.12.3 - HOST: mac - PYTHON_VERSION: '3.7' - ARCH: clang_64 - Python 3.6 QT 5.13.0 mac desktop clang_64: - TARGET: desktop - ARCHDIR: clang_64 - QT_VERSION: 5.13.0 - HOST: mac - PYTHON_VERSION: '3.6' - ARCH: clang_64 Python 3.7 QT 5.13.0 mac android android_x86: - TARGET: android - ARCHDIR: android_x86 - QT_VERSION: 5.13.0 - HOST: mac - PYTHON_VERSION: '3.7' ARCH: android_x86 - Python 3.7 QT 5.13.0 mac desktop clang_64: - TARGET: desktop - ARCHDIR: clang_64 QT_VERSION: 5.13.0 - HOST: mac + 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 - Python 3.7 QT 5.11.3 mac desktop clang_64: - TARGET: desktop + QT_VERSION: 5.13.0 ARCHDIR: clang_64 - QT_VERSION: 5.11.3 - HOST: mac 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_VERSION: 5.11.3 + ARCHDIR: clang_64 + PYTHON_VERSION: '3.7' + TARGET: desktop + HOST: mac - job: Windows pool: vmImage: vs2017-win2016 @@ -102,160 +60,83 @@ jobs: - template: ci/steps.yml strategy: matrix: - Python 3.7 QT 5.11.3 windows desktop win64_msvc2017_64: - TARGET: desktop - ARCHDIR: msvc2017_64 - QT_VERSION: 5.11.3 - HOST: windows - PYTHON_VERSION: '3.7' - ARCH: win64_msvc2017_64 - Python 3.6 QT 5.13.0 windows desktop win64_msvc2015_64: - TARGET: desktop - ARCHDIR: msvc2015_64 - QT_VERSION: 5.13.0 - HOST: windows - PYTHON_VERSION: '3.6' - ARCH: win64_msvc2015_64 - Python 3.6 QT 5.13.0 windows desktop win64_msvc2017_64: - TARGET: desktop - ARCHDIR: msvc2017_64 - QT_VERSION: 5.13.0 - HOST: windows - PYTHON_VERSION: '3.6' - ARCH: win64_msvc2017_64 - Python 3.7 QT 5.13.0 windows android android_x86: - TARGET: android - ARCHDIR: android_x86 - QT_VERSION: 5.13.0 - HOST: windows - PYTHON_VERSION: '3.7' - ARCH: android_x86 - Python 3.6 QT 5.11.3 windows desktop win32_msvc2015: - TARGET: desktop - ARCHDIR: msvc2015 - QT_VERSION: 5.11.3 - HOST: windows - PYTHON_VERSION: '3.6' - ARCH: win32_msvc2015 - Python 3.7 QT 5.13.0 windows desktop win64_msvc2015_64: - TARGET: desktop - ARCHDIR: msvc2015_64 - QT_VERSION: 5.13.0 - HOST: windows - PYTHON_VERSION: '3.7' - ARCH: win64_msvc2015_64 - Python 3.6 QT 5.13.0 windows desktop win32_msvc2017: - TARGET: desktop - ARCHDIR: msvc2017 - QT_VERSION: 5.13.0 - HOST: windows - PYTHON_VERSION: '3.6' - ARCH: win32_msvc2017 - Python 3.6 QT 5.13.0 windows android android_x86: - TARGET: android - ARCHDIR: android_x86 - QT_VERSION: 5.13.0 - HOST: windows - PYTHON_VERSION: '3.6' - ARCH: android_x86 - Python 3.7 QT 5.13.0 windows desktop win32_msvc2017: - TARGET: desktop - ARCHDIR: msvc2017 - QT_VERSION: 5.13.0 - HOST: windows - PYTHON_VERSION: '3.7' - ARCH: win32_msvc2017 - Python 3.7 QT 5.13.0 windows desktop win32_mingw73: - TARGET: desktop - ARCHDIR: mingw73 - QT_VERSION: 5.13.0 - HOST: windows - PYTHON_VERSION: '3.7' - ARCH: win32_mingw73 - Python 3.6 QT 5.13.0 windows android android_armv7: - TARGET: android - ARCHDIR: android_armv7 - QT_VERSION: 5.13.0 - HOST: windows - PYTHON_VERSION: '3.6' - ARCH: android_armv7 - Python 3.7 QT 5.12.3 windows desktop win64_msvc2017_64: - TARGET: desktop - ARCHDIR: msvc2017_64 - QT_VERSION: 5.12.3 - HOST: windows - PYTHON_VERSION: '3.7' - ARCH: win64_msvc2017_64 - Python 3.6 QT 5.12.3 windows desktop win32_msvc2017: - TARGET: desktop - ARCHDIR: msvc2017 - QT_VERSION: 5.12.3 - HOST: windows - PYTHON_VERSION: '3.6' - ARCH: win32_msvc2017 - Python 3.7 QT 5.13.0 windows android android_armv7: - TARGET: android - ARCHDIR: android_armv7 - QT_VERSION: 5.13.0 - HOST: windows - PYTHON_VERSION: '3.7' - ARCH: android_armv7 - Python 3.6 QT 5.11.3 windows desktop win64_msvc2017_64: - TARGET: desktop - ARCHDIR: msvc2017_64 - QT_VERSION: 5.11.3 - HOST: windows - PYTHON_VERSION: '3.6' - ARCH: win64_msvc2017_64 - Python 3.7 QT 5.11.3 windows desktop win32_msvc2015: - TARGET: desktop - ARCHDIR: msvc2015 - QT_VERSION: 5.11.3 - HOST: windows - PYTHON_VERSION: '3.7' - ARCH: win32_msvc2015 Python 3.7 QT 5.13.0 windows desktop win64_mingw73: - TARGET: desktop - ARCHDIR: mingw73 - QT_VERSION: 5.13.0 - HOST: windows - PYTHON_VERSION: '3.7' ARCH: win64_mingw73 - Python 3.6 QT 5.12.3 windows desktop win64_msvc2017_64: - TARGET: desktop - ARCHDIR: msvc2017_64 - QT_VERSION: 5.12.3 - HOST: windows - PYTHON_VERSION: '3.6' - ARCH: win64_msvc2017_64 - Python 3.6 QT 5.13.0 windows desktop win32_mingw73: - TARGET: desktop - ARCHDIR: mingw73 QT_VERSION: 5.13.0 + ARCHDIR: mingw73 + PYTHON_VERSION: '3.7' + TARGET: desktop HOST: windows - PYTHON_VERSION: '3.6' - ARCH: win32_mingw73 Python 3.7 QT 5.13.0 windows desktop win64_msvc2017_64: - TARGET: desktop - ARCHDIR: msvc2017_64 - QT_VERSION: 5.13.0 - HOST: windows - PYTHON_VERSION: '3.7' ARCH: win64_msvc2017_64 - Python 3.6 QT 5.13.0 windows desktop win64_mingw73: - TARGET: desktop - ARCHDIR: mingw73 QT_VERSION: 5.13.0 - HOST: windows - PYTHON_VERSION: '3.6' - ARCH: win64_mingw73 - Python 3.7 QT 5.12.3 windows desktop win32_msvc2017: - TARGET: desktop - ARCHDIR: msvc2017 - QT_VERSION: 5.12.3 - HOST: windows + 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_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 + QT_VERSION: 5.13.0 + ARCHDIR: msvc2017 + PYTHON_VERSION: '3.7' + TARGET: desktop + HOST: windows - job: Linux pool: vmImage: ubuntu-16.04 @@ -263,73 +144,38 @@ jobs: - template: ci/steps.yml strategy: matrix: - Python 3.7 QT 5.13.0 linux android android_x86: - TARGET: android - ARCHDIR: android_x86 - QT_VERSION: 5.13.0 - HOST: linux - PYTHON_VERSION: '3.7' - ARCH: android_x86 - Python 3.6 QT 5.11.3 linux desktop gcc_64: - TARGET: desktop - ARCHDIR: gcc_64 - QT_VERSION: 5.11.3 - HOST: linux - PYTHON_VERSION: '3.6' - ARCH: gcc_64 - Python 3.7 QT 5.13.0 linux android android_armv7: - TARGET: android - ARCHDIR: android_armv7 - QT_VERSION: 5.13.0 - HOST: linux - PYTHON_VERSION: '3.7' - ARCH: android_armv7 - Python 3.7 QT 5.12.3 linux desktop gcc_64: - TARGET: desktop - ARCHDIR: gcc_64 - QT_VERSION: 5.12.3 - HOST: linux - PYTHON_VERSION: '3.7' - ARCH: gcc_64 - Python 3.6 QT 5.13.0 linux android android_x86: - TARGET: android - ARCHDIR: android_x86 - QT_VERSION: 5.13.0 - HOST: linux - PYTHON_VERSION: '3.6' - ARCH: android_x86 - Python 3.6 QT 5.13.0 linux desktop gcc_64: - TARGET: desktop - ARCHDIR: gcc_64 - QT_VERSION: 5.13.0 - HOST: linux - PYTHON_VERSION: '3.6' - ARCH: gcc_64 - Python 3.6 QT 5.12.3 linux desktop gcc_64: - TARGET: desktop - ARCHDIR: gcc_64 - QT_VERSION: 5.12.3 - HOST: linux - PYTHON_VERSION: '3.6' - ARCH: gcc_64 - Python 3.7 QT 5.13.0 linux desktop gcc_64: - TARGET: desktop - ARCHDIR: gcc_64 - QT_VERSION: 5.13.0 - HOST: linux - PYTHON_VERSION: '3.7' - ARCH: gcc_64 - Python 3.6 QT 5.13.0 linux android android_armv7: - TARGET: android - ARCHDIR: android_armv7 - QT_VERSION: 5.13.0 - HOST: linux - PYTHON_VERSION: '3.6' - ARCH: android_armv7 Python 3.7 QT 5.11.3 linux desktop gcc_64: - TARGET: desktop - ARCHDIR: gcc_64 - QT_VERSION: 5.11.3 - HOST: linux - PYTHON_VERSION: '3.7' ARCH: gcc_64 + QT_VERSION: 5.11.3 + ARCHDIR: gcc_64 + PYTHON_VERSION: '3.7' + TARGET: desktop + HOST: linux + Python 3.7 QT 5.13.0 linux desktop gcc_64: + ARCH: gcc_64 + 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 + 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' + TARGET: desktop + HOST: linux diff --git a/generate_azure_pipelines_yml.py b/generate_azure_pipelines_yml.py index 9baf6cf..d26f999 100644 --- a/generate_azure_pipelines_yml.py +++ b/generate_azure_pipelines_yml.py @@ -23,7 +23,6 @@ class PlatformBuildJobs: python_versions = [ - '3.6', '3.7', ]