diff options
| author | Simo Fält <simo.falt@qt.io> | 2022-12-29 10:01:50 +0200 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2022-12-29 11:00:45 +0200 |
| commit | baa27a8423c7b36c5b2ed14ca0d1cf7dc4131a1b (patch) | |
| tree | 9f43be4c67162d6fc095b4153bb21b61494f590b | |
| parent | c8840e264e930260b58a0c3cd4e53cbf66aa10c9 (diff) | |
CI: Fix Windows version detection to get correct python
Pick-to: 6.2 6.4
Change-Id: Ice773bb3497fddce636b959c1a0314e722c3c72c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| -rw-r--r-- | coin_build_instructions.py | 2 | ||||
| -rw-r--r-- | coin_test_instructions.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py index 2755ee3bb..ebef6c3a8 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -155,7 +155,7 @@ if __name__ == "__main__": python_ver = "3.8" wheel_package_dir = "qfpa-p3.6" if CI_TARGET_OS in ["Windows"]: - if os.environ.get('HOST_OSVERSION_COIN') == 'windows_10_21h2': + if (os.environ.get('HOST_OSVERSION_COIN')).startswith('windows_10'): python_ver = "3.10.0" wheel_package_dir = "qfpa-p3.10" else: diff --git a/coin_test_instructions.py b/coin_test_instructions.py index 3261599e4..54b9127a9 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -98,7 +98,7 @@ def run_test_instructions(): # In win machines, there are additional python versions to test with if CI_HOST_OS == "Windows": - if os.environ.get('HOST_OSVERSION_COIN') == 'windows_10_21h2': + if (os.environ.get('HOST_OSVERSION_COIN')).startswith('windows_10'): call_testrunner("3.10.0", str(testRun)) else: call_testrunner("3.7.9", str(testRun)) |