aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Fält <simo.falt@qt.io>2022-05-25 09:58:25 +0300
committerSimo Fält <simo.falt@qt.io>2022-06-22 09:23:59 +0300
commit577354a1a28856bcc633ac6a2dad8e7eec8097fe (patch)
tree7319fbd385dc0e445ba53ab214957d7c7191e68f
parentd585d17727eadfa934f66167f8abadee9bc43eaf (diff)
Take python3.7 in use with win11 and python3.10 with win10
Change-Id: Ifd34be5de6d2cdbeb571320a21dfd3bb7ec47b37 Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 94a597d37a787d18ba239f4326a00f83cd977fb2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--coin_build_instructions.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py
index 1c4c10f2b..779f66f55 100644
--- a/coin_build_instructions.py
+++ b/coin_build_instructions.py
@@ -192,6 +192,11 @@ if __name__ == "__main__":
if CI_TARGET_OS in ["Linux"]:
python_ver = "3.8"
+ if CI_TARGET_OS in ["Windows"]:
+ if os.environ.get('HOST_OSVERSION_COIN') == 'windows_10_21h2':
+ python_ver = "3.10"
+ else:
+ python_ver = "3.7"
if CI_TEST_PHASE in ["ALL", "BUILD"]:
call_setup(python_ver, "BUILD")
# Until CI has a feature to set more dynamic signing dir, make sure it actually exist