@eui/tools 4.21.17 → 4.21.18

package/.version.properties

@@ -1 +1 @@
-4.21.17
+4.21.18

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 4.21.18 (2022-04-22)
+
+##### Bug Fixes
+
+* **other:**
+  * support to support develop merge check versions - EUI-4106 [EUI-4106](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4106)  ([dbec66eb](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/dbec66ebdaecbbe05f7c1c3418a010658c3c28b2))
+
+* * *
+* * *
 ## 4.21.17 (2022-04-20)
 
 ##### Bug Fixes

package/package.json

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

package/sandbox.js

@@ -696,7 +696,15 @@ const translationUtils = require('./scripts/utils/pre-build/translations/transla
 
 Promise.resolve()
   .then(() => {
-     return initUtils.processResolutionsForNodeVersion();
+    //  return initUtils.processResolutionsForNodeVersion();
+    const b1 = 'support/7.x';
+    const b2 = 'support/develop-10.x';
+
+    const v1 = b1.split('/')[1];
+    const v2 = b2.split('-')[1];
+
+    console.log(v1, v2);
+
   })
 
 // return Promise.resolve()

package/scripts/utils/git-utils.js

@@ -245,30 +245,37 @@ const mergeSupportToSupportDevelop = (pkg, folder, supportBranch, supportSnapsho
   if (dryRun) {
     tools.logInfo('DRY-RUN: skipping merge support to supportDevelop');
     return Promise.resolve();
+  }
 
-  } else {
+  const supportBranchVersion = supportBranch.split('/')[1];
+  const supportSnapshotBranchVersion = supportSnapshotBranch.split('-')[1];
 
-    if (pkg && pkg.build && pkg.build.masterBranchOnly) {
-      tools.logInfo('Merge skipped project config set to master branch only');
-      return Promise.resolve();
+  if (supportBranchVersion !== supportSnapshotBranchVersion) {
+    tools.logInfo('skipping... support version and support snapshot versions are different');
+    tools.logInfo(`[${supportBranchVersion}] vs [${supportSnapshotBranchVersion}]`);
+    return Promise.resolve();
+  }
 
-    } else {
-      return Promise.resolve()
-        .then(() => {
-          execa.shellSync(`git fetch origin`, { cwd: folder });
-          execa.shellSync(`git checkout ${supportSnapshotBranch}`, { cwd: folder });
-          execa.shellSync(`git merge origin/${supportSnapshotBranch}`, { cwd: folder });
-          execa.shellSync(`git merge -X theirs ${supportBranch}`, { cwd: folder });
-          execa.shellSync(`git push origin ${supportSnapshotBranch}`, { cwd: folder });
-          execa.shellSync(`git checkout ${supportBranch}`, { cwd: folder });
-        })
-        .then(() => {
-          tools.logSuccess();
-        })
-        .catch((e) => {
-          throw new Error(`Error trying merging ${supportBranch} to ${supportSnapshotBranch} on ${folder}`);
-        })
-    }
+  if (pkg && pkg.build && pkg.build.masterBranchOnly) {
+    tools.logInfo('Merge skipped project config set to master branch only');
+    return Promise.resolve();
+
+  } else {
+    return Promise.resolve()
+      .then(() => {
+        execa.shellSync(`git fetch origin`, { cwd: folder });
+        execa.shellSync(`git checkout ${supportSnapshotBranch}`, { cwd: folder });
+        execa.shellSync(`git merge origin/${supportSnapshotBranch}`, { cwd: folder });
+        execa.shellSync(`git merge -X theirs ${supportBranch}`, { cwd: folder });
+        execa.shellSync(`git push origin ${supportSnapshotBranch}`, { cwd: folder });
+        execa.shellSync(`git checkout ${supportBranch}`, { cwd: folder });
+      })
+      .then(() => {
+        tools.logSuccess();
+      })
+      .catch((e) => {
+        throw new Error(`Error trying merging ${supportBranch} to ${supportSnapshotBranch} on ${folder}`);
+      })
   }
 }