@eui/tools 5.3.90 → 5.3.92

package/.version.properties

@@ -1 +1 @@
-5.3.90
+5.3.92

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 5.3.92 (2022-11-08)
+
+##### Bug Fixes
+
+* **other:**
+  * version fetching for support/ branches - adding rebase to git second try - EUI-6448 [EUI-6448](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-6448)  ([d6fbc5d4](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/d6fbc5d46b71ccfa936da891cfab12d3f81a69ec))
+
+* * *
+* * *
+## 5.3.91 (2022-11-08)
+
+##### Bug Fixes
+
+* **other:**
+  * git pull rebase - metadata issues - EUI-6448 [EUI-6448](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-6448)  ([f674c504](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/f674c504aee8e17b00f01d7e2da46bb88fb975fa))
+
+* * *
+* * *
 ## 5.3.90 (2022-11-03)
 
 ##### Bug Fixes

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@eui/tools",
-    "version": "5.3.90",
-    "tag": "latest",
+    "version": "5.3.92",
+    "tag": "prev",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",
     "main": "index.js",

package/sandbox.js

@@ -864,16 +864,7 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 
 
 
-// const pkg = configUtils.packages.getPackage('opsys-epc-esub-bo-ui', true);
 
-// Promise.resolve()
-//   .then(() => {
-//     return metadataUtils.package.getPackageVersionsByMajor(pkg, '9', false)
-//   })
-//   .then((versions) => {
-//     console.log(versions);
-//     console.log(versions.splice(-1)[0].version);
-//   })
 
 
 // PROJECT VERSION CSDR BUILD TESTING (à la carte way === MWP / PMO MOBILE / SEDIA)
@@ -959,3 +950,15 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 // const version = configUtils.packages.getRemoteEuiVersion(pkg);
 // const versionNumber = version.split('.')[0];
 // console.log(versionNumber);
+
+
+const pkg = configUtils.packages.getPackage('cc-task-manager-ui', true);
+
+Promise.resolve()
+  .then(() => {
+    return metadataUtils.package.getPackageVersionsByMajor(pkg, '4', false)
+  })
+  .then((versions) => {
+    console.log(JSON.stringify(versions, null, 2));
+    console.log(versions.splice(-1)[0].version);
+  })

package/scripts/csdr/metadata/package.js

@@ -476,15 +476,9 @@ module.exports.getPackageVersionsByMajor = (pkg, major, isMaster) => {
       tools.logInfo(`----> ${versions.length} metadata versions found excluding snapshots`);
 
     } else {
-      versions = versions.filter(v => v.version.indexOf('snapshot') !== -1);
-      tools.logInfo(`----> ${versions.length} metadata versions found including snapshots`);
-
-      if (versions.length === 0) {
-        versions = pkgVersions.filter(v => v.version.split('.')[0] === major);
-        versions = versions.filter(v => v.version.indexOf('snapshot') === -1);
-        tools.logInfo(`----> ${versions.length} metadata versions non-master release for major`);
-      }
-    }
+      versions = pkgVersions.filter(v => v.version.split('.')[0] === major);
+      tools.logInfo(`----> ${versions.length} metadata versions non-master release for major`);
+  }
 
     return versions;
   }

package/scripts/utils/git-utils.js

@@ -110,8 +110,8 @@ const commitAndPush = (branch, message, folder) => {
       }
 
       try {
-        tools.logInfo('Commit and push - second try - retrying pull & push');
-        execa.sync('git', ['pull', 'origin', branch], { cwd: folder });
+        tools.logInfo('Commit and push - second try - retrying pull rebase & push');
+        execa.sync('git', ['pull', 'origin', branch, '--rebase'], { cwd: folder });
         execa.sync('git', ['push', 'origin', branch], { cwd: folder });
 
       } catch (e3) {
@@ -146,11 +146,6 @@ const tagVersion = (version, branch, message, folder) => {
       })
       .catch((e) => {
         return Promise.resolve()
-        // .then(() => {
-        //   return new Promise((resolve) => {
-        //     setTimeout(resolve, 8000);
-        //   });
-        // })
         .then(() => {
           execa.sync('git', ['tag', '-a', `v${version}b`, '-m', message], { cwd: folder });
           execa.sync('git', ['push', '--follow-tags', 'origin', branch], { cwd: folder });