From e6a5bcd9eb2b63d1a8a020ac3fdf9d66851e0960 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 15 Aug 2019 08:52:43 +0200 Subject: Exclude SLES_12,15 from COIN builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6ba6cb1799837ebcf093404ca3415c893584f21e Reviewed-by: Christian Tismer Reviewed-by: Simo Fält --- build_scripts/utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build_scripts/utils.py b/build_scripts/utils.py index b34d37123..5169f403d 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -1148,7 +1148,8 @@ def run_instruction(instruction, error, initial_env=None): def acceptCITestConfiguration(hostOS, hostOSVer, targetArch, compiler): # Disable unsupported CI configs for now # NOTE: String must match with QT CI's storagestruct thrift - if hostOSVer in ["WinRT_10", "WebAssembly", "Ubuntu_18_04"]: + if hostOSVer in ["WinRT_10", "WebAssembly", "Ubuntu_18_04"] \ + or hostOSVer.startswith("SLES_"): 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 -- cgit v1.2.3 From a790865e3159a12e427a6b55114bdbd05881ce9d Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 14 Aug 2019 15:57:21 +0200 Subject: Update pyside2-tools submodule Change-Id: Ifc268eea8a3c0137d19524d6d7114e3238a41a6d Task-number: PYSIDE-1035 Reviewed-by: Cristian Maureira-Fredes --- sources/pyside2-tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/pyside2-tools b/sources/pyside2-tools index bd27bac45..3c402fef5 160000 --- a/sources/pyside2-tools +++ b/sources/pyside2-tools @@ -1 +1 @@ -Subproject commit bd27bac457943aab1082ac1c5b3f81ef9574c671 +Subproject commit 3c402fef54106b65ab9c1df92c39c4626424fdd8 -- cgit v1.2.3