diff options
| -rw-r--r-- | build_scripts/utils.py | 2 | ||||
| -rw-r--r-- | coin_build_instructions.py | 4 | ||||
| -rw-r--r-- | coin_test_instructions.py | 4 | ||||
| -rw-r--r-- | sources/pyside2/pyside_version.py | 14 | ||||
| -rw-r--r-- | sources/shiboken2/shiboken_version.py | 14 |
5 files changed, 17 insertions, 21 deletions
diff --git a/build_scripts/utils.py b/build_scripts/utils.py index f535db636..1a622aad5 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -1121,7 +1121,7 @@ def run_instruction(instruction, error): def acceptCITestConfiguration(hostOS, hostOSVer, targetArch, compiler): # Disable unsupported CI configs for now # NOTE: String must match with QT CI's storagesturct thrift - if hostOSVer in ["WinRT_10"]: + if hostOSVer in ["WinRT_10", "MacOS_10_13"]: print("Disabled " + hostOSVer + " from Coin configuration") return False # With 5.11 CI will create two sets of release binaries, one with msvc 2015 and one with msvc 2017 diff --git a/coin_build_instructions.py b/coin_build_instructions.py index aee0bf265..9f9a74bc9 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -127,6 +127,10 @@ def run_build_instructions(): if not acceptCITestConfiguration(CI_HOST_OS, CI_HOST_OS_VER, CI_TARGET_ARCH, CI_COMPILER): exit() + if CI_HOST_ARCH == "X86_64" and CI_TARGET_ARCH == "X86": + print("Disabled 32 bit build on 64 bit from Coin configuration, until toolchains provisioned") + exit() + # Uses default python, hopefully we have python2 installed on all hosts # Skip building using Python 2 on Windows, because of different MSVC C runtimes (VS2008 vs VS2015+) if CI_HOST_OS != "Windows": diff --git a/coin_test_instructions.py b/coin_test_instructions.py index bd65b5b7e..c2c5c07ea 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -76,6 +76,10 @@ def run_test_instructions(): if not acceptCITestConfiguration(CI_HOST_OS, CI_HOST_OS_VER, CI_TARGET_ARCH, CI_COMPILER): exit() + if CI_HOST_ARCH == "X86_64" and CI_TARGET_ARCH == "X86": + print("Disabled 32 bit build on 64 bit from Coin configuration, until toolchains provisioned") + exit() + os.chdir(CI_ENV_AGENT_DIR) testRun = 0 # We didn't build for Python 2 in win diff --git a/sources/pyside2/pyside_version.py b/sources/pyside2/pyside_version.py index 789812464..a883bab96 100644 --- a/sources/pyside2/pyside_version.py +++ b/sources/pyside2/pyside_version.py @@ -38,16 +38,10 @@ ############################################################################# major_version = "5" -minor_version = "11" -patch_version = "1" - -# For example: "a", "b", "rc" -# (which means "alpha", "beta", "release candidate"). -# An empty string means the generated package will be an official release. -pre_release_version_type = "a" - -# For example: "1", "2" (which means "beta1", "beta2", if type is "b"). -pre_release_version = "1" +minor_version = "12" +patch_version = "0" +pre_release_version_type = "a" # e.g. "a", "b", "rc". +pre_release_version = "1" # e.g "1", "2", (which means "beta1", "beta2", if type is "b") if __name__ == '__main__': # Used by CMake. diff --git a/sources/shiboken2/shiboken_version.py b/sources/shiboken2/shiboken_version.py index 789812464..a883bab96 100644 --- a/sources/shiboken2/shiboken_version.py +++ b/sources/shiboken2/shiboken_version.py @@ -38,16 +38,10 @@ ############################################################################# major_version = "5" -minor_version = "11" -patch_version = "1" - -# For example: "a", "b", "rc" -# (which means "alpha", "beta", "release candidate"). -# An empty string means the generated package will be an official release. -pre_release_version_type = "a" - -# For example: "1", "2" (which means "beta1", "beta2", if type is "b"). -pre_release_version = "1" +minor_version = "12" +patch_version = "0" +pre_release_version_type = "a" # e.g. "a", "b", "rc". +pre_release_version = "1" # e.g "1", "2", (which means "beta1", "beta2", if type is "b") if __name__ == '__main__': # Used by CMake. |