@eui/tools 5.0.0-rc.15 → 5.0.0-rc.18

package/.version.properties

@@ -1 +1 @@
-5.0.0-rc.15
+5.0.0-rc.18

package/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 5.0.0-rc.18 (2022-03-31)
+
+##### Bug Fixes
+
+* **other:**
+  * added compositeType as exported gitlab variables - EUI-5632 [EUI-5632](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5632)  ([606a7916](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/606a791695f6697bfa34b14dd4ddf0e5a132e119))
+
+* * *
+* * *
+## 5.0.0-rc.17 (2022-03-31)
+
+##### Bug Fixes
+
+* **other:**
+  * export of app_target - EUI-5632 [EUI-5632](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5632)  ([2452d13b](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/2452d13b517f261642079795721af154991c9c88))
+
+* * *
+* * *
+## 5.0.0-rc.16 (2022-03-31)
+
+##### Bug Fixes
+
+* **other:**
+  * control tag and merge for envTarget remote delivery - EUI-5632 [EUI-5632](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5632)  ([a0b1568e](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/a0b1568ebe20b0cbb2ef8c85bb01df032e37f122))
+
+* * *
+* * *
 ## 5.0.0-rc.15 (2022-03-31)
 
 ##### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "5.0.0-rc.15",
+    "version": "5.0.0-rc.18",
     "tag": "next",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",

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

@@ -342,14 +342,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()
+const commitPackage = (pkg, version, branches) => {
   // COMMIT and PUSH UPDATED FILES ON PACKAGE REPOSITORY
+  return Promise.resolve()
   .then(() => {
     return utils.git.commitAndPush(
       branches.branch,
@@ -357,7 +353,14 @@ module.exports.runGitOperations = (pkg, version) => {
       pkg.paths.pkgDirectory
     );
   })
+  .catch((e) => {
+    throw e;
+  })
+}
 
+
+const tagAndMerge = (pkg, version, branches) => {
+  return Promise.resolve()
   // TAG THE NEW RELEASE (MASTER) for MASTER and SUPPORT
   .then(() => {
     if (!branches.isSnapshot && !branches.isSupportSnapshot) {
@@ -392,6 +395,41 @@ module.exports.runGitOperations = (pkg, version) => {
 
 
 
+module.exports.runGitOperations = (pkg, version) => {
+  utils.tools.logBanner('RUN GIT OPERATIONS');
+
+  const branches = this.getBranches();
+  console.log(branches);
+
+  if (pkg.remote && pkg.build && pkg.build.envTargetActive) {
+    utils.tools.logInfo('Remote - with envTargetActive set - commit package only');
+
+    return Promise.resolve()
+    .then(() => {
+      return commitPackage(pkg, version, branches);
+    })
+    .catch((e) => {
+      throw e;
+    })
+
+  } else {
+    utils.tools.logInfo('Normal UI package - commit package, tagging and do merge operations if needed');
+
+    return Promise.resolve()
+    .then(() => {
+      return commitPackage(pkg, version, branches);
+    })
+    .then(() => {
+      return tagAndMerge(pkg, version, branches);
+    })
+    .catch((e) => {
+      throw e;
+    })
+  }
+}
+
+
+
 module.exports.storeMetadata = (pkg, version, pkgMetadata, pkgCompositeDeps, duration, envTarget) => {
   utils.tools.logBanner('STORE METADATA');
 
@@ -414,9 +452,11 @@ module.exports.storeMetadata = (pkg, version, pkgMetadata, pkgCompositeDeps, dur
 }
 
 
-module.exports.exportPipelineVariables = (pkg) => {
+module.exports.exportPipelineVariables = (pkg, compositeType) => {
   utils.tools.logBanner('EXPORT PIPELINE VARIABLES');
 
+  let variablesContent = '';
+
   return Promise.resolve()
   .then(() => {
     if (pkg.remote) {
@@ -432,11 +472,18 @@ module.exports.exportPipelineVariables = (pkg) => {
 
       utils.tools.logInfo(`appTarget generated : ${appTarget}`);
 
+      variablesContent += `export APP_TARGET=${appTarget}\n`;
+
+      if (compositeType) {
+        utils.tools.logInfo(`Exporting COMPOSITE_TYPE : ${compositeType}`);
+        variablesContent += `export COMPOSITE_TYPE=${compositeType}\n`;
+      }
+
       if (dryRun) {
         utils.tools.logWarning('dryRun...skipping export');
       } else {
         utils.tools.logInfo('Exporting appTarget variable');
-        return utils.pipeline.setVariables(pkg.paths.rootDirectory, `export APP_TARGET=${pkg.build.appTarget}\n`);
+        return utils.pipeline.setVariables(pkg.paths.rootDirectory, variablesContent);
       }
     }
   })

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

@@ -178,7 +178,7 @@ module.exports.run = () => {
 
       // EXPORT ADDITIONAL PIPELINE VARIABLES
       .then(() => {
-        return innerCommon.exportPipelineVariables(pkg);
+        return innerCommon.exportPipelineVariables(pkg, compositeType);
       })