@eui/tools 5.3.2 → 5.3.3

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 (4) hide show
  1. package/.version.properties +1 -1
  2. package/CHANGELOG.md +9 -0
  3. package/package.json +1 -1
  4. package/scripts/csdr/release/app/release-app.js +3 -1
package/.version.properties CHANGED
@@ -1 +1 @@
1
- 5.3.2
1
+ 5.3.3
package/CHANGELOG.md CHANGED
@@ -1,3 +1,12 @@
1
+ ## 5.3.3 (2022-05-31)
2
+
3
+ ##### Bug Fixes
4
+
5
+ * **other:**
6
+ * app with masterBranchOnly build - EUI-4106 [EUI-4106](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4106) ([d66e3076](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/d66e3076fc4f90adc11fc59b3d8068995537c237))
7
+
8
+ * * *
9
+ * * *
1
10
  ## 5.3.2 (2022-05-31)
2
11
 
3
12
  ##### Bug Fixes
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eui/tools",
3
- "version": "5.3.2",
3
+ "version": "5.3.3",
4
4
  "tag": "latest",
5
5
  "license": "EUPL-1.1",
6
6
  "description": "eUI common tools and scripts",
package/scripts/csdr/release/app/release-app.js CHANGED
@@ -344,7 +344,9 @@ module.exports.run = () => {
344
344
  // for env-target based builds, no need to merge anything back as it only contains a master branch for sources
345
345
  if (!envTarget) {
346
346
  if (!isSnapshot && !isSupportBranch && !isSupportSnapshotBranch) {
347
- return utils.git.mergeMasterToDevelop(project, project.folder);
347
+ if (project.build && !project.build.masterBranchOnly) {
348
+ return utils.git.mergeMasterToDevelop(project, project.folder);
349
+ }
348
350
  }
349
351
  }
350
352
  })