@eui/tools 5.3.54 → 5.3.55

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- 5.3.54
1
+ 5.3.55
package/CHANGELOG.md CHANGED
@@ -1,3 +1,12 @@
1
+ ## 5.3.55 (2022-09-22)
2
+
3
+ ##### Bug Fixes
4
+
5
+ * **other:**
6
+ * reverting pull rebase on second commmit retry - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107) ([41bc9d62](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/41bc9d62abe3d8920fa5ff0f960227b1e4f42ad0))
7
+
8
+ * * *
9
+ * * *
1
10
  ## 5.3.54 (2022-09-21)
2
11
 
3
12
  ##### Chores
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eui/tools",
3
- "version": "5.3.54",
3
+ "version": "5.3.55",
4
4
  "tag": "latest",
5
5
  "license": "EUPL-1.1",
6
6
  "description": "eUI common tools and scripts",
@@ -110,8 +110,8 @@ const commitAndPush = (branch, message, folder) => {
110
110
  }
111
111
 
112
112
  try {
113
- tools.logInfo('Commit and push - second try - retrying pull rebase & push');
114
- execa.sync('git', ['pull --rebase', 'origin', branch], { cwd: folder });
113
+ tools.logInfo('Commit and push - second try - retrying pull & push');
114
+ execa.sync('git', ['pull', 'origin', branch], { cwd: folder });
115
115
  execa.sync('git', ['push', 'origin', branch], { cwd: folder });
116
116
 
117
117
  } catch (e3) {