@eui/tools 5.3.50 → 5.3.52

package/.version.properties

@@ -1 +1 @@
-5.3.50
+5.3.52

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 5.3.52 (2022-09-21)
+
+##### Bug Fixes
+
+* **other:**
+  * second retry on git commit using -X their strategy - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([15350bbd](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/15350bbdab94dc07455306f9daeecd3a66b81278))
+
+* * *
+* * *
+## 5.3.51 (2022-09-20)
+
+##### Chores
+
+* **other:**
+  * disabled backend central metadata updates - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([ff68d23b](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/ff68d23be69e9a9f8b0a4f0b8522b69f8fbeb410))
+
+* * *
+* * *
 ## 5.3.50 (2022-09-16)
 
 ##### Bug Fixes

package/package.json

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

package/scripts/csdr/metadata/package.js

@@ -74,6 +74,11 @@ module.exports.storeMetadata = (
     .then(() => {
       tools.logInfo('Storing pkg devops metadata...');
 
+      if (pkg.backend) {
+        tools.logInfo('Backend package detected...skipping central metadata updates');
+        return;
+      }
+
       const metadataFile = path.join(
         configOptions.DEVOPS_METADATA_PATH,
         configOptions.DEVOPS_METADATA_JSON
@@ -242,7 +247,6 @@ module.exports.storeMetadata = (
         tools.writeJsonFileSync(metadataFile, metadata);
       } else {
         tools.logInfo(`Write metadata on ${metadataFile}`);
-        // console.log(metadata);
       }
 
       devopsMetadata = metadata;

package/scripts/csdr/version/package-common.js

@@ -147,11 +147,15 @@ const writePomXml = (pkg, newVersion, isSnapshot, isForceTimestamp = true) => {
 
 
 module.exports.updateVersion = (pkg, newVersion, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch, envTarget) => {
-  if (pkg.backend) {
-    return writePomXml(pkg, newVersion, isSnapshot);
-  }
-  else {
-    return writePackageJson(pkg, newVersion, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch, envTarget);
+  try {
+    if (pkg.backend) {
+      return writePomXml(pkg, newVersion, isSnapshot);
+    }
+    else {
+      return writePackageJson(pkg, newVersion, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch, envTarget);
+    }
+  } catch(e) {
+    throw e;
   }
 }
 

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 -X theirs & push');
+        execa.sync('git', ['pull -X theirs', 'origin', branch], { cwd: folder });
         execa.sync('git', ['push', 'origin', branch], { cwd: folder });
 
       } catch (e3) {