@eui/tools 6.13.10 → 6.13.12

package/.version.properties

@@ -1 +1 @@
-6.13.10
+6.13.12

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.13.12 (2023-11-24)
+
+##### Chores
+
+* **other:**
+  * alter source path for SonarQube when subEntries - EUI-8525 [EUI-8525](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-8525)  ([b2aafac9](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/b2aafac9b8dc438b680560200629fadfbf7e50aa))
+
+* * *
+* * *
+## 6.13.11 (2023-11-22)
+
+##### Chores
+
+* **other:**
+  * add pipeline link when launching package build - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([a672c5e6](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/a672c5e6b53110aed4dfde159fd510f88c28a222))
+
+* * *
+* * *
 ## 6.13.10 (2023-11-22)
 
 ##### Chores

package/package.json

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

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

@@ -129,16 +129,23 @@ module.exports.init = (pkg, envTarget, compositeType) => {
         launchMessage += ` Launching *${pkg.name}* release for branch *${branches.branch}*`;
       }
 
-      if (pipelineId) {
-        launchMessage += `==> Gitlab pipeline ID : *${pipelineId}*`;
-      }
-
       return utils.notification.package.sendPackageMessage({
         package: pkg,
         text: launchMessage
       });
     })
 
+    .then(() => {
+      if (pipelineId) {
+        const launchMessage = `:arrow_forward: :arrow_forward: Pipeline ID : https://gitlab.ecdevops.eu/eui/cc-csdr-root/-/pipelines/${pipelineId}`;
+
+        return utils.notification.package.sendPackageMessage({
+          package: pkg,
+          text: launchMessage
+        });
+      }
+    })
+
     .catch((e) => {
       throw e;
     })

package/scripts/csdr/templates/sonar-project.template

@@ -2,7 +2,7 @@ sonar.projectKey=CSDR-@project.name@
 sonar.projectName=@project.name@
 sonar.projectVersion=@project.version@
 
-sonar.sources=@project.path@/src/lib/
+sonar.sources=@project.path@
 sonar.sourceEncoding=UTF-8
 
 sonar.test.inclusions=**/*.spec.ts

package/scripts/csdr/templates/template-utils.js

@@ -66,7 +66,7 @@ const generateMavenSettings = (userName, userPassword, outputPath) => {
 
 
 
-const generateSonarPropertiesUI = (pkgName, pkgVersion, outputPath) => {
+const generateSonarPropertiesUI = (pkgName, pkgVersion, outputPath, hasSubEntries = false) => {
   tools.logInfo('Generating sonar property file for UI package...');
 
   const outputFilePath = path.join(outputPath, 'sonar-project.properties');
@@ -91,7 +91,7 @@ const generateSonarPropertiesUI = (pkgName, pkgVersion, outputPath) => {
         })
         .then(() => {
           tools.logInfo('Replace project package path...');
-          return tools.replaceInFile(outputFilePath, '@project.path@', outputPath);
+          return tools.replaceInFile(outputFilePath, '@project.path@', outputPath + hasSubEntries ? '' : '/src/lib/');
         })
         .then(() => {
           tools.logInfo('Replace project lcov root path...');

package/scripts/utils/sonar/sonar-utils.js

@@ -109,7 +109,7 @@ const runUI = (pkg, isMaster) => {
     })
     .then((gitShortHash) => {
       return templateUtils.generateSonarPropertiesUI(
-        pkg.name, gitShortHash, pkg.paths.root
+        pkg.name, gitShortHash, pkg.paths.root, !pkg.build.sourceRootDefault
       );
     })
     .then(() => {