@eui/tools 5.3.47 → 5.3.49

package/.version.properties

@@ -1 +1 @@
-5.3.47
+5.3.49

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 5.3.49 (2022-09-16)
+
+##### Bug Fixes
+
+* **other:**
+  * remove backend locks - exception not rethrown in case of ui locks - 15m for auto-unlocking - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([abb792a5](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/abb792a5fd391e0eab7c09e9bdfa40b31e951e3b))
+
+* * *
+* * *
+## 5.3.48 (2022-09-15)
+
+##### Bug Fixes
+
+* **other:**
+  * master build of package take snapshots as dependencies - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([fc0fca99](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/fc0fca99b916e2f7fe4cd147c73452395bbf363d))
+
+* * *
+* * *
 ## 5.3.47 (2022-09-15)
 
 ##### Chores

package/package.json

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

package/scripts/csdr/install/build-package.js

@@ -10,11 +10,11 @@ const innerRemotes = require('./remotes');
 
 
 
-module.exports.installPackage = (prj, pkg) => {
+module.exports.installPackage = (prj, pkg, isMaster) => {
   return Promise.resolve()
     // checking remotes
     .then(() => {
-      return innerPackages.installDeps(prj, pkg);
+      return innerPackages.installDeps(prj, pkg, isMaster);
     })
 
     // returning metadata dependencies

package/scripts/csdr/install/packages.js

@@ -14,7 +14,7 @@ const innerCommon = require('./common');
 const innerProjects = require('./projects');
 
 
-module.exports.installDeps = (prj, pkg) => {
+module.exports.installDeps = (prj, pkg, isMaster) => {
   let compositeDeps, localPkgDeps, localPkgCompositeDeps;
 
   return Promise.resolve()
@@ -62,7 +62,7 @@ module.exports.installDeps = (prj, pkg) => {
     })
 
     .then((depsMetadata) => {
-      return innerCommon.getRemappedDeps(depsMetadata, localPkgCompositeDeps);
+      return innerCommon.getRemappedDeps(depsMetadata, localPkgCompositeDeps, isMaster);
     })
 
     .then((remappedLocalPkgCompositeDeps) => {

package/scripts/csdr/metadata/package.js

@@ -533,11 +533,11 @@ module.exports.isPackageLocked = (pkg) => {
 
         tools.logInfo(`checking diff current date from locked date : ${diff}`);
 
-        if (diff > 30) {
-          tools.logInfo(`> 30m => ok forcing unlock`);
+        if (diff > 15) {
+          tools.logInfo(`> 15m => ok forcing unlock`);
           return false;
         } else {
-          tools.logInfo(`< 30m => keep lock`);
+          tools.logInfo(`< 15m => keep lock`);
           return true;
         }
 

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

@@ -154,16 +154,18 @@ module.exports.preReleaseChecks = (pkg) => {
 
   // CHECKING PACKAGE LOCK STATE - AVOID SAME PACKAGE RUN issuing race conditions
   .then(() => {
-    utils.tools.logTitle('Checking package lock state');
+    if (!pkg.backend) {
+      utils.tools.logTitle('Checking package lock state');
 
-    // if package is locked, exception is thrown, check this specific exception handling in the global catch
-    if (metadataUtils.package.isPackageLocked(pkg)) {
-      utils.tools.logInfo('Package is locked ==> throwing exception');
-      throw 'PACKAGE_LOCKED';
+      // if package is locked, exception is thrown, check this specific exception handling in the global catch
+      if (metadataUtils.package.isPackageLocked(pkg)) {
+        utils.tools.logInfo('Package is locked ==> throwing exception');
+        throw 'PACKAGE_LOCKED';
 
-      // if package is not locked, we lock it
-    } else {
-      return metadataUtils.package.lockPackage(pkg);
+        // if package is not locked, we lock it
+      } else {
+        return metadataUtils.package.lockPackage(pkg);
+      }
     }
   })
 
@@ -599,7 +601,9 @@ module.exports.sendSuccessNotification = (pkg, version, pkgMetadata) => {
     })
 
     .then(() => {
-      return metadataUtils.package.unlockPackage(pkg);
+      if (!pkg.backend) {
+        return metadataUtils.package.unlockPackage(pkg);
+      }
     });
   })
 }
@@ -629,9 +633,18 @@ module.exports.sendErrorNotification = (pkg, exception, pkgMetadata) => {
     })
 
     .then(() => {
-      // in case of package locked detected, we don't unlock the package
-      if (exception !== 'PACKAGE_LOCKED') {
-        return metadataUtils.package.unlockPackage(pkg);
+      if (!pkg.backend) {
+        // in case of package locked detected, we don't unlock the package
+        if (exception !== 'PACKAGE_LOCKED') {
+          return Promise.resolve()
+          .then(() => {
+            return metadataUtils.package.unlockPackage(pkg);
+          })
+          .catch((e) => {
+            utils.tools.logError('ERROR UNLOCKING PACKAGE');
+            console.log(e);
+          })
+        }
       }
     })
 

package/scripts/csdr/release/package/release-package.js

@@ -14,7 +14,6 @@ const metadataUtils = require('../../metadata/metadata-utils');
 const innerCommon = require('./common');
 const innerUi = require('./ui');
 const innerRemote = require('./remote');
-const innerBackend = require('./backend');
 
 
 module.exports.run = () => {
@@ -87,11 +86,8 @@ module.exports.run = () => {
         if (pkg.remote) {
           return innerRemote.install(pkg, envTarget, compositeType);
 
-        // } else if (pkg.backend) {
-        //   return innerBackend.install(pkg);
-
         } else {
-          return innerUi.install(pkg);
+          return innerUi.install(pkg, branches.isMaster);
         }
       })
       .then((compositeDeps) => {

package/scripts/csdr/release/package/remote.js

@@ -3,8 +3,12 @@
 // GLOBAL
 const path = require('path');
 const installUtils = require('../../install/install-utils');
+const tools = require('../../../utils/tools');
+
 
 module.exports.install = (pkg, envTarget, compositeType) => {
+  tools.logBanner('INSTALL');
+
   var pkgCompositeDeps = {};
 
   return Promise.resolve()

package/scripts/csdr/release/package/ui.js

@@ -12,7 +12,9 @@ const notificationUtils = require('../../../utils/notification/notification-util
 const tools = require('../../../utils/tools');
 
 
-module.exports.install = (pkg) => {
+module.exports.install = (pkg, isMaster) => {
+  tools.logBanner('INSTALL');
+
   return Promise.resolve()
 
   // FETCHING CURRENT PACKAGES & INSTALL
@@ -21,7 +23,7 @@ module.exports.install = (pkg) => {
     const prj = configUtils.projects.getProject();
 
     // install the dependencies for current package build
-    return installUtils.buildPackage.installPackage(prj, pkg);
+    return installUtils.buildPackage.installPackage(prj, pkg, isMaster);
   })
 
 

package/scripts/index.js

@@ -124,7 +124,6 @@ module.exports.metadataStats = require('./csdr/metadata/stats');
 
 // csdr - release
 module.exports.realeaseApp = require('./csdr/release/app/release-app');
-module.exports.releasePackageBackend = require('./csdr/release/package/backend');
 module.exports.releasePackageCommon = require('./csdr/release/package/common');
 module.exports.releasePackage = require('./csdr/release/package/release-package');
 module.exports.releasePackageRemote = require('./csdr/release/package/remote');

package/scripts/utils/notification/common.js

@@ -61,7 +61,7 @@ module.exports.getMessage = (options) => {
 
       case 'PACKAGE_LOCKED':
         message.detailTitle = 'CONCURRENT BUILD DETECTED FOR PACKAGE - ABORTING!';
-        message.detailText = 'Another build has been detected for the current package being build\n Retry again this build after 30m, lock will be auto-cleared';
+        message.detailText = 'Another build has been detected for the current package being build\n Retry again this build after 15m, lock will be auto-cleared';
         break;
 
       case 'MULTIPLE_LOCAL_EUI_VERSIONS_FOUND':

package/scripts/csdr/release/package/backend.js

@@ -1,26 +0,0 @@
-'use strict';
-
-// GLOBAL
-const path = require('path');
-
-// LOCAL
-const installUtils = require('../../install/install-utils');
-const configUtils = require('../../config/config-utils');
-
-module.exports.install = (pkg) => {
-  return Promise.resolve()
-
-  // FETCHING CURRENT PACKAGES & INSTALL
-  .then(() => {
-    // fetch related project if passed as arguments
-    const prj = configUtils.projects.getProject();
-
-    // install the dependencies for current package build
-    return installUtils.buildPackage.install(prj, pkg);
-  })
-
-  .catch((e) => {
-    throw e;
-  })
-}
-