diff --git a/ci/generate_azure_pipelines_matrices.py b/ci/generate_azure_pipelines_matrices.py index bf59814..6edc73e 100644 --- a/ci/generate_azure_pipelines_matrices.py +++ b/ci/generate_azure_pipelines_matrices.py @@ -148,6 +148,16 @@ windows_build_jobs.extend( module="qtcharts qtnetworkauth", mirror=random.choice(MIRRORS), ), + BuildJob( + "install-qt", + "5.14.2", + "windows", + "desktop", + "win64_msvc2017_64", + "msvc2017_64", + spec=">1,<5.15", # Don't redirect output! Must be wrapped in quotes! + mirror=random.choice(MIRRORS), + ), ] ) diff --git a/ci/steps.yml b/ci/steps.yml index 996902f..3c1aa05 100644 --- a/ci/steps.yml +++ b/ci/steps.yml @@ -35,7 +35,11 @@ steps: if [[ "$(SUBARCHIVES)" != "" ]]; then opt+=" --archives $(SUBARCHIVES)" fi - python -m aqt install-qt $(HOST) $(TARGET) $(QT_VERSION) $(ARCH) $opt + if [[ "$(SPEC)" == "" ]]; then + python -m aqt install-qt $(HOST) $(TARGET) $(QT_VERSION) $(ARCH) $opt + else + python -m aqt install-qt $(HOST) $(TARGET) "$(SPEC)" $(ARCH) $opt + fi if [[ "$(TARGET)" == "android" || "$(TARGET)" == "ios" ]]; then if [[ "$(HOST)" == "windows" ]]; then python -m aqt install-qt $(HOST) desktop $(QT_VERSION) mingw81_64 --archives qtbase