@eui/tools 4.19.11 → 4.19.12

package/.version.properties

@@ -1 +1 @@
-4.19.11
+4.19.12

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 4.19.12 (2022-02-22)
+
+##### Bug Fixes
+
+* **other:**
+  * support to support/develop back merge issue - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([3ffcbe18](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/3ffcbe188c9693817745fb817213b909bb564fba))
+
+* * *
+* * *
 ## 4.19.11 (2022-02-21)
 
 ##### Bug Fixes

package/package.json

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

package/sandbox.js

@@ -643,17 +643,17 @@ const translationUtils = require('./scripts/utils/pre-build/translations/transla
 
 
 
-const prjName = 'my-workplace';
-const prj = configUtils.projects.getCsdrProject(prjName);
+// const prjName = 'my-workplace';
+// const prj = configUtils.projects.getCsdrProject(prjName);
 
-return Promise.resolve()
-  // .then(() => {
-  //   return injectionUtils.externals.injectExternalAppSources(prj);
-  // })
-  .then(() => {
-    // return injectionUtils.externals.remapRoutesByEnvConfig(prj, 'DEV', true);
-    return injectionUtils.routesReplacement.buildRoutes(prj, 'DEV', true);
-  })
+// return Promise.resolve()
+//   // .then(() => {
+//   //   return injectionUtils.externals.injectExternalAppSources(prj);
+//   // })
+//   .then(() => {
+//     // return injectionUtils.externals.remapRoutesByEnvConfig(prj, 'DEV', true);
+//     return injectionUtils.routesReplacement.buildRoutes(prj, 'DEV', true);
+//   })
 
 
 
@@ -664,3 +664,11 @@ return Promise.resolve()
 //     const pkg = configUtils.packages.getPackage('opsys-result-quality-management-eui10-remote-el-ui', true);
 //     return translationUtils.elements.generate('eui,opsys', pkg)
 //   })
+
+
+
+return Promise.resolve()
+  .then(() => {
+    const pkg = configUtils.packages.getPackage('eui', true);
+    console.log(pkg);
+  })

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

@@ -44,6 +44,7 @@ module.exports.getEnvTarget = () => {
 
 
 module.exports.init = (pkg) => {
+  utils.tools.logBanner('INIT');
 
   const branches = this.getBranches();
 
@@ -91,6 +92,8 @@ module.exports.init = (pkg) => {
 
 
 module.exports.preReleaseChecks = (pkg) => {
+  utils.tools.logBanner('PRE-RELEASE checks');
+
   return Promise.resolve()
 
   // GET AND CHECK DEVOPS CONFIG
@@ -121,6 +124,8 @@ module.exports.preReleaseChecks = (pkg) => {
 
 
 module.exports.commitMetadataChecks = (pkg) => {
+  utils.tools.logBanner('Commit metadata checks');
+
   utils.tools.logTitle('Checking package commit metadata');
   let pkgMetadata;
 
@@ -155,6 +160,8 @@ module.exports.commitMetadataChecks = (pkg) => {
 
 
 module.exports.preBuild = (pkg) => {
+  utils.tools.logBanner('PRE-BUILD');
+
   return Promise.resolve()
   .then(() => {
     return utils.buildPackage.preBuild(pkg);
@@ -169,6 +176,7 @@ module.exports.preBuild = (pkg) => {
 
 
 module.exports.updateVersion = (pkg, pkgMetadata) => {
+  utils.tools.logBanner('UPDATE VERSION');
 
   // getting branch flags
   const branches = this.getBranches();
@@ -207,6 +215,8 @@ module.exports.updateVersion = (pkg, pkgMetadata) => {
 
 
 module.exports.generateChangelog = (pkg, version, pkgMetadata) => {
+  utils.tools.logBanner('GENERATE CHANGELOG');
+
   return Promise.resolve()
 
   // GENERATE CHANGELOG
@@ -241,6 +251,8 @@ module.exports.generateChangelog = (pkg, version, pkgMetadata) => {
 
 
 module.exports.postBuild = (pkg, version) => {
+  utils.tools.logBanner('POST BUILD');
+
   return Promise.resolve()
   // all packages
   .then(() => {
@@ -262,6 +274,8 @@ module.exports.postBuild = (pkg, version) => {
 
 
 module.exports.storeMetadataAssets = (pkg, pkgCompositeDeps) => {
+  utils.tools.logBanner('STORE METADATA ASSETS');
+
   return Promise.resolve()
     .then(() => {
       if (pkg.remote) {
@@ -275,8 +289,10 @@ module.exports.storeMetadataAssets = (pkg, pkgCompositeDeps) => {
 }
 
 module.exports.runGitOperations = (pkg, version) => {
+  utils.tools.logBanner('RUN GIT OPERATIONS');
 
   const branches = this.getBranches();
+  console.log(branches);
 
   return Promise.resolve()
   // COMMIT and PUSH UPDATED FILES ON PACKAGE REPOSITORY
@@ -302,14 +318,16 @@ module.exports.runGitOperations = (pkg, version) => {
   // MERGE BACK ON DEVELOP for MASTER / LATEST RELEASE
   .then(() => {
     if (branches.isMaster) {
+      utils.tools.logInfo('Branch is master merge back to develop');
       return utils.git.mergeMasterToDevelop(pkg, pkg.paths.pkgDirectory, version);
     }
   })
 
   // MERGE BACK ON support/develop for support release for package that has a support/develop branch active
   .then(() => {
-    if (branches.isSupport && pkg.build && pkg.build.supportDevelopBranch) {
-      return utils.git.mergeSupportToSupportDevelop(pkg, pkg.paths.pkgDirectory, branches.branch, pkg.build.supportDevelopBranch);
+    if (branches.isSupport && pkg.build && pkg.build.supportSnapshotBranch) {
+      utils.tools.logInfo('Branch is support / supportSnapshotBranch config detected');
+      return utils.git.mergeSupportToSupportDevelop(pkg, pkg.paths.pkgDirectory, branches.branch, pkg.build.supportSnapshotBranch);
     }
   })
 
@@ -321,6 +339,8 @@ module.exports.runGitOperations = (pkg, version) => {
 
 
 module.exports.storeMetadata = (pkg, version, pkgMetadata, pkgCompositeDeps, duration) => {
+  utils.tools.logBanner('STORE METADATA');
+
   const branches = this.getBranches();
 
   return Promise.resolve()
@@ -340,6 +360,8 @@ module.exports.storeMetadata = (pkg, version, pkgMetadata, pkgCompositeDeps, dur
 
 
 module.exports.generateDiffReport = (pkg, newVersion) => {
+  utils.tools.logBanner('GENERATE DIFF REPORT');
+
   const branches = this.getBranches();
 
   return Promise.resolve()
@@ -375,6 +397,8 @@ module.exports.generateDiffReport = (pkg, newVersion) => {
 
 
 module.exports.sendSuccessNotification = (pkg, version, pkgMetadata) => {
+  utils.tools.logBanner('SEND SUCCESS NOTIFICATION');
+
   return Promise.resolve()
   .then(() => {
     utils.tools.logTitle('Sending slack success');
@@ -410,6 +434,8 @@ module.exports.sendSuccessNotification = (pkg, version, pkgMetadata) => {
 
 
 module.exports.sendErrorNotification = (pkg, exception, pkgMetadata) => {
+  utils.tools.logBanner('SEND ERROR NOTIFICATION');
+
   // console.log(pkgMetadata);
 
   return Promise.resolve()

package/scripts/utils/git-utils.js

@@ -229,14 +229,14 @@ const mergeMasterToDevelop = (pkg, folder, version) => {
 }
 
 
-const mergeSupportToSupportDevelop = (pkg, folder, supportBranch, supportDevelopBranch) => {
-  if (!supportDevelopBranch) {
-    tools.logWarning('supportDevelopBranch not found in package config...skipping');
+const mergeSupportToSupportDevelop = (pkg, folder, supportBranch, supportSnapshotBranch) => {
+  if (!supportSnapshotBranch) {
+    tools.logWarning('supportSnapshotBranch not found in package config...skipping');
     return Promise.resolve();
   }
 
-  tools.logTitle(`Merge back on ${supportDevelopBranch}`);
-  tools.logInfo(`Merging release changes into ${supportDevelopBranch} branch...`);
+  tools.logTitle(`Merge back on ${supportSnapshotBranch}`);
+  tools.logInfo(`Merging release changes into ${supportSnapshotBranch} branch...`);
 
   if (dryRun) {
     tools.logInfo('DRY-RUN: skipping merge support to supportDevelop');
@@ -252,17 +252,17 @@ const mergeSupportToSupportDevelop = (pkg, folder, supportBranch, supportDevelop
       return Promise.resolve()
         .then(() => {
           execa.shellSync(`git fetch origin`, { cwd: folder });
-          execa.shellSync(`git checkout ${supportDevelopBranch}`, { cwd: folder });
-          execa.shellSync(`git merge origin/${supportDevelopBranch}`, { 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 ${supportDevelopBranch}`, { 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 ${supportDevelopBranch} on ${folder}`);
+          throw new Error(`Error trying merging ${supportBranch} to ${supportSnapshotBranch} on ${folder}`);
         })
     }
   }