@eui/tools 5.3.52 → 5.3.54

package/.version.properties

@@ -1 +1 @@
-5.3.52
+5.3.54

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 5.3.54 (2022-09-21)
+
+##### Chores
+
+* **other:**
+  * store backend metadata in repository instead of devops-metadata - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([1fbd3dbe](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/1fbd3dbe87d79381e18c6c52ab5aba05849b1233))
+
+* * *
+* * *
+## 5.3.53 (2022-09-21)
+
+##### Bug Fixes
+
+* **other:**
+  * git rebase if conflicts during metadata push - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([fa7552be](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/fa7552be262b169c6bf0a086f5e8e0f23c61ef6d))
+
+* * *
+* * *
 ## 5.3.52 (2022-09-21)
 
 ##### Bug Fixes

package/package.json

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

package/scripts/csdr/metadata/package-versions.js

@@ -41,7 +41,13 @@ module.exports.storeMetadata = (pkg, pkgVersion, pkgCompositeDeps, duration, env
       var generatedMetadata = {};
       var versions = [];
 
-      const pkgMetadataFile = path.join(configOptions.DEVOPS_METADATA_PATH, pkg.devopsVersionsMetadataFile);
+      let pkgMetadataFile;
+
+      if (pkg.backend) {
+        pkgMetadataFile = path.join(pkg.paths.pkgDirectory, 'package-versions-metadata.json');
+      } else {
+        pkgMetadataFile = path.join(configOptions.DEVOPS_METADATA_PATH, pkg.devopsVersionsMetadataFile);
+      }
 
       if (tools.isFileExists(pkgMetadataFile)) {
         generatedMetadata = require(pkgMetadataFile);

package/scripts/csdr/metadata/package.js

@@ -293,14 +293,20 @@ module.exports.storeMetadata = (
 const storeBuildMetadata = (pkg, pkgVersion, pkgMetadata, envTarget) => {
   return Promise.resolve()
     .then(() => {
-      tools.logInfo('Storing package LATEST metadata...');
+      tools.logInfo('Storing package BUILD metadata...');
 
       const configOptions = configUtils.global.getConfigOptions();
 
       var generatedMetadata = {};
       var versions = [];
 
-      const pkgMetadataFile = path.join(configOptions.DEVOPS_METADATA_PATH, pkg.devopsMetadataFile);
+      let pkgMetadataFile;
+
+      if (pkg.backend) {
+        pkgMetadataFile = path.join(pkg.paths.pkgDirectory, 'package-build-metadata.json');
+      } else {
+        pkgMetadataFile = path.join(configOptions.DEVOPS_METADATA_PATH, pkg.devopsMetadataFile);
+      }
 
       if (tools.isFileExists(pkgMetadataFile)) {
         generatedMetadata = require(pkgMetadataFile);

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

@@ -150,31 +150,58 @@ module.exports.run = () => {
       })
 
 
-      // GIT OPERATIONS
       .then(() => {
-        return innerCommon.runGitOperations(pkg, newVersion);
-      })
+        if (pkg.backend) {
 
+          return Promise.resolve()
+            // STORING CENTRALIZED METADATA
+            .then(() => {
+              // get run duration
+              const duration = utils.pipeline.getTimerDuration();
+              return innerCommon.storeMetadata(pkg, newVersion, pkgMetadata, pkgCompositeDeps, duration, envTarget);
+            })
 
-      // STORING CENTRALIZED METADATA
-      .then(() => {
-        // get run duration
-        const duration = utils.pipeline.getTimerDuration();
-        return innerCommon.storeMetadata(pkg, newVersion, pkgMetadata, pkgCompositeDeps, duration, envTarget);
-      })
+            // GIT OPERATIONS
+            .then(() => {
+              return innerCommon.runGitOperations(pkg, newVersion);
+            })
 
-      // STORING PACKAGE HISTORY
-      .then(() => {
-        if (branches.isMaster && pkg.remote) {
-          return innerCommon.generateDiffReport(pkg, newVersion);
-        }
-      })
+            .catch((e) => {
+              throw e;
+            })
 
-      // COMMITING METADATA
-      .then(() => {
-        return innerCommon.commitMetadata(pkg, newVersion);
-      })
+        } else {
 
+          return Promise.resolve()
+            // GIT OPERATIONS
+            .then(() => {
+              return innerCommon.runGitOperations(pkg, newVersion);
+            })
+
+            // STORING CENTRALIZED METADATA
+            .then(() => {
+              // get run duration
+              const duration = utils.pipeline.getTimerDuration();
+              return innerCommon.storeMetadata(pkg, newVersion, pkgMetadata, pkgCompositeDeps, duration, envTarget);
+            })
+
+            // STORING PACKAGE HISTORY
+            .then(() => {
+              if (branches.isMaster && pkg.remote) {
+                return innerCommon.generateDiffReport(pkg, newVersion);
+              }
+            })
+
+            // COMMITING METADATA
+            .then(() => {
+              return innerCommon.commitMetadata(pkg, newVersion);
+            })
+
+            .catch((e) => {
+              throw e;
+            })
+        }
+      })
 
       // EXPORT ADDITIONAL PIPELINE VARIABLES
       .then(() => {

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