@eui/tools 6.20.9 → 6.20.10

package/.version.properties

@@ -1 +1 @@
-6.20.9
+6.20.10

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 6.20.10 (2024-08-07)
+
+##### Chores
+
+* **other:**
+  * force branch checkout for git operations for standalone pkg build - EUI-9788 [EUI-9788](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-9788)  ([05d33d10](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/05d33d10fb8e62319d16782bd4b438bbb1651434))
+
+* * *
+* * *
 ## 6.20.9 (2024-08-07)
 
 ##### Chores

package/package.json

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

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

@@ -468,7 +468,8 @@ const commitPackage = (pkg, version, branches) => {
     return utils.git.commitAndPush(
       branches.branch,
       `chore(release): update version: ${version} - from CI server [skip ci]`,
-      pkg.paths.root
+      pkg.paths.root,
+      pkg.standalone
     );
   })
   .catch((e) => {

package/scripts/utils/git-utils.js

@@ -78,16 +78,24 @@ const hasCommitsSinceLastTag = (folder, version) => {
   }
 }
 
-const commitAndPushCore = (branch, message, folder) => {
-  execa.sync('git', ['add', '.'], { cwd: folder, stdio: 'inherit' });
-  execa.sync('git', ['commit', '-m', message], { cwd: folder, stdio: 'inherit' });
-  execa.sync('git', ['checkout', branch], { cwd: folder, stdio: 'inherit' });
-  execa.sync('git', ['pull', 'origin', branch], { cwd: folder, stdio: 'inherit' });
-  execa.sync('git', ['push', 'origin', branch], { cwd: folder, stdio: 'inherit' });
+const commitAndPushCore = (branch, message, folder, standalone = false) => {
+  if (standalone) {
+    execa.sync('git', ['checkout', branch], { cwd: folder, stdio: 'inherit' });
+    execa.sync('git', ['add', '.'], { cwd: folder, stdio: 'inherit' });
+    execa.sync('git', ['commit', '-m', message], { cwd: folder, stdio: 'inherit' });
+    execa.sync('git', ['pull', 'origin', branch], { cwd: folder, stdio: 'inherit' });
+    execa.sync('git', ['push', 'origin', branch], { cwd: folder, stdio: 'inherit' });
+  } else {
+    execa.sync('git', ['add', '.'], { cwd: folder });
+    execa.sync('git', ['commit', '-m', message], { cwd: folder });
+    execa.sync('git', ['checkout', branch], { cwd: folder });
+    execa.sync('git', ['pull', 'origin', branch], { cwd: folder });
+    execa.sync('git', ['push', 'origin', branch], { cwd: folder });
+  }
 }
 
 // double-run in case of race-condition of 2 pkg built and trying to push as the same time
-const commitAndPush = (branch, message, folder) => {
+const commitAndPush = (branch, message, folder, standalone = false) => {
   tools.logTitle('Commit and pushing files');
   tools.logInfo(`on branch : ${branch} / folder provided : ${folder}`);
 
@@ -98,7 +106,7 @@ const commitAndPush = (branch, message, folder) => {
 
     try {
       tools.logInfo('commit and push - first try');
-      commitAndPushCore(branch, message, folder);
+      commitAndPushCore(branch, message, folder, standalone);
 
     } catch (e2) {
       tools.logError('ERROR');