diff options
| author | Simo Fält <simo.falt@qt.io> | 2023-11-27 15:23:16 +0200 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2023-11-27 15:25:29 +0200 |
| commit | 9b76f0fcf5caef43290a97bc612fc57d77e87acb (patch) | |
| tree | f488b8a9657f654427dbd2a561399abf1791e5f3 | |
| parent | 593ea17278207926144be734a7e5d8eb4078ec46 (diff) | |
Revert "CI: Adapt to Python 3.11 with rhel configs"
This reverts commit c3275fe632022b38c6ce06716f671bafb6c0bf38. The
Pyhton update from 3.8 to 3.11 is missing from released version
of qt5.
Change-Id: I3e14b176aefb6f92a21736fdc9aa7175c2768394
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -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 8cb3c1d50..ab1c45eff 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.11" + variableValue: "python3.8" enable_if: condition: property property: host.osVersion diff --git a/coin_build_instructions.py b/coin_build_instructions.py index ec02f8e81..de3b9a8cd 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.11" + python_ver = "3.8" 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 5c5ed8d2c..03959a536 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.11", str(testRun)) + call_testrunner("3.8", str(testRun)) else: call_testrunner("3", str(testRun)) |