@eui/tools 6.21.116 → 6.21.118

package/.version.properties

@@ -1 +1 @@
-6.21.116
+6.21.118

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 6.21.118 (2025-09-05)
+
+##### Chores
+
+* **other:**
+  * adapted to handle script-eui-tools.json import for hybrid bitbucket / gitlab local install - MWP-11955 [MWP-11955](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-11955)  ([1a8f7beb](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/1a8f7bebb810527bd92ba7799133bb3e7de93902))
+  * adapted to handle script-eui-tools.json import for hybrid bitbucket / gitlab local install  ([7d006b89](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/7d006b89272d5b0182b7c6095c0632add1546e9d))
+
+* * *
+* * *
+## 6.21.117 (2025-09-05)
+
+##### Chores
+
+* **other:**
+  * debug clone error - MWP-11955 [MWP-11955](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-11955)  ([202f40a9](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/202f40a9bfb84d376b4264e4075d57645f22d3d1))
+
+* * *
+* * *
 ## 6.21.116 (2025-09-05)
 
 ##### Chores

package/package.json

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

package/scripts/csdr/init/projects.js

@@ -22,11 +22,15 @@ module.exports.importScripts = () => {
       projects.forEach((p) => {
         tools.logInfo(`Project :  ${p.name}`);
 
-        const scriptsFile = path.join(process.cwd(), p.folder, 'scripts.json');
+        let scriptsFile = path.join(process.cwd(), p.folder, 'scripts-eui-tools.json');
         if (!tools.isFileExists(scriptsFile)) {
-          tools.logInfo('no scripts.json file found - skipping');
+          scriptsFile = path.join(process.cwd(), p.folder, 'scripts.json');
+        }
+
+        if (!tools.isFileExists(scriptsFile)) {
+          tools.logInfo('no scripts.json or scripts-eui-tools.json file found - skipping');
         } else {
-          tools.logInfo('Processing scripts.json file');
+          tools.logInfo('Processing scripts-eui-tools.json file');
           const scriptsJson = require(scriptsFile);
           rootPackageJson.scripts = { ...rootPackageJson.scripts, ...scriptsJson };
         }

package/scripts/utils/git-utils.js

@@ -269,7 +269,11 @@ const getGitHost = (externalRepo, sdlc = false) => {
       if (externalRepo) {
         return config.git.externals.remote;
       } else {
-        return config.git.remote;
+        if (sdlc) {
+          return config.git.sdlc;
+        } else {
+          return config.git.remote;
+        }
       }
     }
   }
@@ -342,6 +346,7 @@ const cloneRepo = (repoUri, folder, forced = false, shallow = false, externalRep
           auth = process.env.gituser_sdlc && process.env.gitpassword_sdlc ? `${process.env.gituser_sdlc}:${process.env.gitpassword_sdlc}@` : '';
         }
         const gitHost = getGitHost(externalRepo, sdlc);
+        tools.logInfo(`git host : ${gitHost}`);
 
         if (shallow) {
           execa.shellSync(`git clone --depth 1 https://${auth}${gitHost}${repoUri} ${folder}`);
@@ -361,7 +366,6 @@ const cloneRepo = (repoUri, folder, forced = false, shallow = false, externalRep
       if (!build) {
         console.log(e);
       }
-      console.log(e);
       throw new Error(`Error trying to clone ${repoUri} into ${folder}`);
     })
 }