@eui/tools 6.12.54 → 6.12.56

package/.version.properties

@@ -1 +1 @@
-6.12.54
+6.12.56

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.12.56 (2023-09-16)
+
+##### Bug Fixes
+
+* **other:**
+  * localdev installation fetching rc package deps - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([a4fb9761](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/a4fb9761f4a43b74d675001f0201a81d50d8179b))
+
+* * *
+* * *
+## 6.12.55 (2023-09-15)
+
+##### Bug Fixes
+
+* **other:**
+  * prevent unknown supported branches to be processed by build release - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([7a42606a](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/7a42606a91fa9523b3cc5eedcce7438334fcc863))
+
+* * *
+* * *
 ## 6.12.54 (2023-09-15)
 
 ##### Chores

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "6.12.54",
+    "version": "6.12.56",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",

package/sandbox.js

@@ -22,6 +22,7 @@ const apiUtils = require('./scripts/utils/api-utils');
 const versionUtils = require('./scripts/csdr/version/version-utils');
 const publishUtils = require('./scripts/utils/publish/publish-utils');
 
+
 // console.log(configUtils.packages.getPackages());
 // console.log(configUtils.packages.getPackage('eui-tools'));
 
@@ -1329,16 +1330,26 @@ const publishUtils = require('./scripts/utils/publish/publish-utils');
 //     console.log(e);
 //   })
 
-Promise.resolve()
-  .then(() => {
-    const pkg = configUtils.remotes.getRemote('cc-task-details-eui15-remote-el-ui', true);
-    console.log(pkg);
+// Promise.resolve()
+//   .then(() => {
+//     const pkg = configUtils.remotes.getRemote('cc-task-details-eui15-remote-el-ui', true);
+//     console.log(pkg);
 
-    const deps = installUtils.remotes.getDeps(pkg, 'TST');
-    console.log(deps);
+//     const deps = installUtils.remotes.getDeps(pkg, 'TST');
+//     console.log(deps);
 
-  })
+//   })
+
+//   .catch((e) => {
+//     console.log(e);
+//   })
 
+Promise.resolve()
+  .then(() => {
+    const util = require('./scripts/csdr/release/package/common');
+    const branches = util.getBranches();
+    console.log(branches);
+  })
   .catch((e) => {
     console.log(e);
   })

package/scripts/csdr/install/local-dev.js

@@ -114,7 +114,7 @@ module.exports.install = (providedDeps) => {
 
       const configDeps = { ...resolvedDeps, ...fixedDeps };
 
-      return innerCommon.getResolvedCarretDeps(configDeps, false);
+      return innerCommon.getResolvedCarretDeps(configDeps, false, true);
     })
 
 

package/scripts/csdr/install/packages.js

@@ -173,7 +173,7 @@ module.exports.getLocalPackagesCompositeDepsRemapped = () => {
     .then(() => {
       const compositeDeps = getLocalPackagesCompositeDeps();
 
-      return innerCommon.getResolvedCarretDeps(compositeDeps, false);
+      return innerCommon.getResolvedCarretDeps(compositeDeps, false, true);
     })
 
     .then((remappedDeps) => {
@@ -241,7 +241,7 @@ module.exports.installDeps = (prj, pkg, isMaster) => {
     })
 
     .then(() => {
-      return innerCommon.getResolvedCarretDeps(localPkgCompositeDeps, isMaster);
+      return innerCommon.getResolvedCarretDeps(localPkgCompositeDeps, isMaster, !isMaster);
     })
 
     .then((remappedDepsIn) => {

package/scripts/csdr/release/package/common.js

@@ -26,6 +26,12 @@ const getBranches = module.exports.getBranches = () => {
   const isHotfix = (!isMaster && !isSnapshot && !isSupportSnapshot && !isSupport && branch.indexOf('hotfix/') > -1);
   const isNext = (!isMaster && !isSnapshot && !isSupport && !isSupportSnapshot && !isHotfix && branch.indexOf('next/') > -1);
 
+  let valid = true;
+
+  if (!isSnapshot && !isMaster && !isSupportSnapshot && !isSupport && !isHotfix && !isNext) {
+    valid = false;
+  }
+
   return {
     isSupport: isSupport,
     isSupportSnapshot: isSupportSnapshot,
@@ -33,7 +39,8 @@ const getBranches = module.exports.getBranches = () => {
     isSnapshot: isSnapshot,
     isMaster: isMaster,
     isHotfix: isHotfix,
-    branch: branch
+    branch: branch,
+    valid: valid
   }
 }
 
@@ -182,6 +189,21 @@ module.exports.preReleaseChecks = (pkg) => {
     return metadataUtils.common.isPipelineEnabled(pkg);
   })
 
+  // CHECK BRANCH VALIDITY
+  .then(() => {
+    const branches = this.getBranches();
+
+    utils.tools.logTitle('Checking branch validity');
+
+    if (!branches.valid) {
+      utils.tools.logInfo('Branch not supported ... stopping : allowed branches are develop-master-next/-support/-hotfix/');
+      throw 'BRANCH_NOT_SUPPORTED';
+
+    } else {
+      utils.tools.logInfo('Branch is valid... processing');
+    }
+  })
+
   // CHECKING PACKAGE LOCK STATE - AVOID SAME PACKAGE RUN issuing race conditions
   .then(() => {
     if (!pkg.backend) {