@eui/tools 4.18.4 → 4.18.5

package/.version.properties

@@ -1 +1 @@
-4.18.4
+4.18.5

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 4.18.5 (2021-12-15)
+
+##### Bug Fixes
+
+* **other:**
+  * adapted release-app script taking care of support snapshot builds - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([d4ac56bd](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/d4ac56bdf236fab1e4601d6963df668002d31607))
+
+* * *
+* * *
 ## 4.18.4 (2021-12-15)
 
 ##### Chores

package/package.json

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

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

@@ -37,11 +37,13 @@ module.exports.run = () => {
   }
 
   // Getting branch flags
+  var isSupportSnapshotBranch;
   var isSupportBranch;
   var isSnapshot;
 
   if (branch) {
-    isSupportBranch = (branch !== 'master' && branch.indexOf('support/') > -1);
+    isSupportSnapshotBranch = (branch !== 'master' && branch.indexOf('support/develop') > -1);
+    isSupportBranch = (branch !== 'master' && !isSupportSnapshotBranch && branch.indexOf('support/') > -1);
     isSnapshot = (branch !== 'master' && !isSupportBranch);
   }
 
@@ -56,7 +58,7 @@ module.exports.run = () => {
 
     // for traditional app build using develop / master branch
   } else {
-    if (isSnapshot) {
+    if (isSnapshot || isSupportSnapshotBranch) {
       envTargetGen = 'DEV';
     } else {
       envTargetGen = 'TST';
@@ -145,7 +147,7 @@ module.exports.run = () => {
     .then(() => {
       utils.tools.logTitle('Getting app new version...');
 
-      return versionUtils.app.getNewVersion(project, isSnapshot, isSupportBranch, envTarget);
+      return versionUtils.app.getNewVersion(project, (isSnapshot || isSupportSnapshotBranch), isSupportBranch, envTarget);
     })
     .then((version) => {
       // set the new version found for later use
@@ -199,7 +201,7 @@ module.exports.run = () => {
     // *****************************************************************
     .then(() => {
       // process v1 - diff report is generated on MASTER / TST release
-      if (!isSnapshot && !envTarget) {
+      if (!isSnapshot && !isSupportSnapshotBranch && !envTarget) {
         return metadataUtils.appHistory.generateDiffReport(project, newVersion, isSupportBranch);
       }
 
@@ -256,7 +258,7 @@ module.exports.run = () => {
     // BUILD ANGULAR APPLICATION
     // *****************************************************************
     .then(() => {
-      return utils.buildApp.angular(envTarget, isSnapshot, newVersion);
+      return utils.buildApp.angular(envTarget, (isSnapshot || isSupportSnapshotBranch), newVersion);
     })
 
 
@@ -285,7 +287,7 @@ module.exports.run = () => {
       if (project.build && project.build.distribution) {
         return Promise.resolve()
           .then(() => {
-            return utils.buildApp.generateProjectDistributionFile(project, isSnapshot);
+            return utils.buildApp.generateProjectDistributionFile(project, (isSnapshot || isSupportSnapshotBranch));
           })
           .catch((e) => {
             throw e;
@@ -338,7 +340,7 @@ module.exports.run = () => {
     .then(() => {
       // for env-target based builds, no need to merge anything back as it only contains a master branch for sources
       if (!envTarget) {
-        if (!isSnapshot && !isSupportBranch) {
+        if (isMaster) {
           return utils.git.mergeMasterToDevelop(project, project.folder);
         }
       }