@eui/tools 4.18.5 → 4.18.6

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.
Files changed (5) hide show
  1. package/.version.properties +1 -1
  2. package/CHANGELOG.md +9 -0
  3. package/package.json +1 -1
  4. package/scripts/csdr/install/composite-utils.js +0 -2
  5. package/scripts/csdr/release/app/release-app.js +1 -1
package/.version.properties CHANGED
@@ -1 +1 @@
1
- 4.18.5
1
+ 4.18.6
package/CHANGELOG.md CHANGED
@@ -1,3 +1,12 @@
1
+ ## 4.18.6 (2021-12-15)
2
+
3
+ ##### Bug Fixes
4
+
5
+ * **other:**
6
+ * release app script wrong condition on branch - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107) ([f3745bc1](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/f3745bc13749503726bfbdd11832e90401f59ba6))
7
+
8
+ * * *
9
+ * * *
1
10
  ## 4.18.5 (2021-12-15)
2
11
 
3
12
  ##### Bug Fixes
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eui/tools",
3
- "version": "4.18.5",
3
+ "version": "4.18.6",
4
4
  "tag": "latest",
5
5
  "license": "EUPL-1.1",
6
6
  "description": "eUI common tools and scripts",
package/scripts/csdr/install/composite-utils.js CHANGED
@@ -1,7 +1,5 @@
1
1
  'use strict';
2
2
 
3
- const { deepStrictEqual } = require('assert');
4
- const { toInteger } = require('lodash');
5
3
  // global
6
4
  const path = require('path');
7
5
 
package/scripts/csdr/release/app/release-app.js CHANGED
@@ -340,7 +340,7 @@ module.exports.run = () => {
340
340
  .then(() => {
341
341
  // for env-target based builds, no need to merge anything back as it only contains a master branch for sources
342
342
  if (!envTarget) {
343
- if (isMaster) {
343
+ if (!isSnapshot && !isSupportBranch && !isSupportSnapshotBranch) {
344
344
  return utils.git.mergeMasterToDevelop(project, project.folder);
345
345
  }
346
346
  }