From: qc784398 <quentin.cozette@cea.fr>
Date: Fri, 16 Apr 2021 14:02:48 +0000 (+0200)
Subject: Switch back every FD30/32 builds to master branches (integrations in progress)
X-Git-Tag: V9_7_0~63^2~12
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9fbba47ea39c5ebc9fdeadf3e3ca6e9a2b682cab;p=tools%2Fsat_salome.git

Switch back every FD30/32 builds to master branches (integrations in progress)
---

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 5f3ddc3..7caa8cf 100644
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -175,24 +175,6 @@ APPLICATION :
 }
 __overwrite__ :
 [
-  {
-   # Dedicated builds to check new IMP SMESH 64bits support
-   __condition__ : "VARS.dist in ['FD32', 'FD30']"
-    'APPLICATION.products.KERNEL' : {tag : 'occ/20256'}
-    'PRODUCTS.KERNEL.default.cmake_options' : "-DSALOME_USE_LIBBATCH=ON -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DSALOME_USE_64BIT_IDS=ON"
-    'APPLICATION.products.GUI' : {tag : 'occ/20256'}
-    'APPLICATION.products.SMESH' : {tag : 'occ/20256'}
-    'APPLICATION.products.HEXABLOCK' : {tag : 'occ/20256'}
-    'PRODUCTS.HEXABLOCK.default.patches' : ['HEXABLOCK_occ20256.patch']
-    'APPLICATION.products.HEXABLOCKPLUGIN' : {tag : 'occ/20256'}
-    'APPLICATION.products.NETGENPLUGIN' : {tag : 'occ/20256'}
-    'APPLICATION.products.GHS3DPRLPLUGIN' : {tag : 'occ/20256'}
-    'APPLICATION.products.GHS3DPLUGIN' : {tag : 'occ/20256'}
-    'APPLICATION.products.GMSHPLUGIN' : {tag : 'occ/20256'}
-    'APPLICATION.products.BLSURFPLUGIN' : {tag : 'occ/20256'}
-    'APPLICATION.products.HexoticPLUGIN' : {tag : 'occ/20256'}
-    'APPLICATION.products.HYBRIDPLUGIN' : {tag : 'occ/20256'}
-  }
   {
    __condition__ : "VARS.dist in ['FD32']"
    # https://github.com/scipy/scipy/issues/11611