From 49cc3ebbda89c4edbb3ed662f051439eed8b1ac3 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 18 Mar 2020 21:39:17 +0100 Subject: [PATCH 1/2] #1049 fix ui build on windows --- scm-ui/ui-scripts/src/lerna.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scm-ui/ui-scripts/src/lerna.js b/scm-ui/ui-scripts/src/lerna.js index b5404fbd62..6479b112fb 100644 --- a/scm-ui/ui-scripts/src/lerna.js +++ b/scm-ui/ui-scripts/src/lerna.js @@ -1,7 +1,10 @@ const { spawnSync } = require("child_process"); +const os = require("os"); + +const yarnCmd = os.platform() === "win32" ? "yarn.cmd" : "yarn"; const yarn = args => { - const result = spawnSync("yarn", args, { stdio: "inherit" }); + const result = spawnSync(yarnCmd, args, { stdio: "inherit" }); if (result.error) { console.log("could not start yarn command:", result.error); process.exit(2); From 19ce54d202c129112ef03d0426b1908e33ef7337 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 19 Mar 2020 07:18:17 +0100 Subject: [PATCH 2/2] update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd6ceb194b..8de0a1ae51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Extension point to add links to the repository cards from plug ins ([#1041](https://github.com/scm-manager/scm-manager/pull/1041)) +### Fixed +- Build on windows ([#1048](https://github.com/scm-manager/scm-manager/issues/1048), [#1049](https://github.com/scm-manager/scm-manager/issues/1049), [#1056](https://github.com/scm-manager/scm-manager/pull/1056)) + ## 2.0.0-rc5 - 2020-03-12 ### Added - Added footer extension points for links and avatar