@eui/tools 5.3.51 → 5.3.53
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.
- package/.version.properties +1 -1
- package/CHANGELOG.md +18 -0
- package/package.json +1 -1
- package/scripts/utils/git-utils.js +2 -2
package/.version.properties
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
5.3.
|
|
1
|
+
5.3.53
|
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,21 @@
|
|
|
1
|
+
## 5.3.53 (2022-09-21)
|
|
2
|
+
|
|
3
|
+
##### Bug Fixes
|
|
4
|
+
|
|
5
|
+
* **other:**
|
|
6
|
+
* git rebase if conflicts during metadata push - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107) ([fa7552be](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/fa7552be262b169c6bf0a086f5e8e0f23c61ef6d))
|
|
7
|
+
|
|
8
|
+
* * *
|
|
9
|
+
* * *
|
|
10
|
+
## 5.3.52 (2022-09-21)
|
|
11
|
+
|
|
12
|
+
##### Bug Fixes
|
|
13
|
+
|
|
14
|
+
* **other:**
|
|
15
|
+
* second retry on git commit using -X their strategy - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107) ([15350bbd](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/15350bbdab94dc07455306f9daeecd3a66b81278))
|
|
16
|
+
|
|
17
|
+
* * *
|
|
18
|
+
* * *
|
|
1
19
|
## 5.3.51 (2022-09-20)
|
|
2
20
|
|
|
3
21
|
##### Chores
|
package/package.json
CHANGED
|
@@ -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 push');
|
|
114
|
-
execa.sync('git', ['pull', 'origin', branch], { cwd: folder });
|
|
113
|
+
tools.logInfo('Commit and push - second try - retrying pull rebase & push');
|
|
114
|
+
execa.sync('git', ['pull --rebase', 'origin', branch], { cwd: folder });
|
|
115
115
|
execa.sync('git', ['push', 'origin', branch], { cwd: folder });
|
|
116
116
|
|
|
117
117
|
} catch (e3) {
|