diff options
author | Simo Fält <simo.falt@qt.io> | 2023-11-21 10:24:46 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-11-24 16:32:53 +0000 |
commit | c3275fe632022b38c6ce06716f671bafb6c0bf38 (patch) | |
tree | ef88977cb62f4bdef7021161699da6f15a9d4b7d | |
parent | 696af193a68dc5eb02082de23b9d2a17aacf78a3 (diff) |
CI: Adapt to Python 3.11 with rhel configs
Default Python version on rhel 8.x was updated to 3.11.
Change-Id: Iad60544ee81a2805f7e5ce2b4c9f44df9cf9fdf7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 3a058afcd7ae497c085ea0b0891d164caa38f1fe)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | coin/instructions/common_environment.yaml | 2 | ||||
-rw-r--r-- | coin_build_instructions.py | 2 | ||||
-rw-r--r-- | coin_test_instructions.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml index ab1c45eff..8cb3c1d50 100644 --- a/coin/instructions/common_environment.yaml +++ b/coin/instructions/common_environment.yaml @@ -250,7 +250,7 @@ instructions: equals_value: Linux - type: EnvironmentVariable variableName: interpreter - variableValue: "python3.8" + variableValue: "python3.11" enable_if: condition: property property: host.osVersion diff --git a/coin_build_instructions.py b/coin_build_instructions.py index de3b9a8cd..ec02f8e81 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -147,7 +147,7 @@ if __name__ == "__main__": del os.environ[env_var] python_ver = "3" if CI_TARGET_OS in ["Linux"] and CI_HOST_ARCH !="aarch64": - python_ver = "3.8" + python_ver = "3.11" wheel_package_dir = "qfpa-p3.6" if CI_TARGET_OS in ["Windows"]: if (os.environ.get('HOST_OSVERSION_COIN')).startswith('windows_10'): diff --git a/coin_test_instructions.py b/coin_test_instructions.py index 03959a536..5c5ed8d2c 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -106,7 +106,7 @@ def run_test_instructions(): else: call_testrunner("3.8.1", str(testRun)) elif CI_HOST_OS == "Linux": - call_testrunner("3.8", str(testRun)) + call_testrunner("3.11", str(testRun)) else: call_testrunner("3", str(testRun)) |