From 8280515646a5dec9edfbc4437fea2ce54e699db6 Mon Sep 17 00:00:00 2001 From: Christian Clausen Date: Wed, 4 Dec 2024 12:13:39 +0100 Subject: [PATCH] Publish --- CHANGELOG.md | 4 ++++ Execute.js | 9 ++++++--- Execute.ts | 12 +++++++++--- package.json | 2 +- publish.sh | 14 +++++++------- 5 files changed, 27 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e8ed95f..98b944b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ ## Fixes and improvements - +# 4.4.2 +## Fixes and improvements +- Simulator's service detection ignores files + # 4.4.1 ## Fixes and improvements - Simulator parsing body correctly diff --git a/Execute.js b/Execute.js index 48ac924..700ddfa 100644 --- a/Execute.js +++ b/Execute.js @@ -127,9 +127,12 @@ function parseMerrymakeJson(folder, event) { } function processFolders(pathToRoot, event) { const rivers = {}; - fs.readdirSync(pathToRoot) - .filter((x) => !x.startsWith("(deleted) ") && !x.endsWith(".DS_Store")) - .forEach((group) => { + fs.readdirSync(pathToRoot, { withFileTypes: true }) + .filter((x) => x.isDirectory() && + !x.name.startsWith("(deleted) ") && + !x.name.endsWith(".DS_Store")) + .forEach((g) => { + const group = g.name; fs.readdirSync(`${pathToRoot}/${group}`) .filter((x) => !x.startsWith("(deleted) ") && !x.endsWith(".DS_Store")) .forEach((repo) => { diff --git a/Execute.ts b/Execute.ts index e05f18e..57331b6 100644 --- a/Execute.ts +++ b/Execute.ts @@ -201,9 +201,15 @@ function processFolders(pathToRoot: string, event: string) { const rivers: { [river: string]: { group: string; repo: string; action: string }[]; } = {}; - fs.readdirSync(pathToRoot) - .filter((x) => !x.startsWith("(deleted) ") && !x.endsWith(".DS_Store")) - .forEach((group) => { + fs.readdirSync(pathToRoot, { withFileTypes: true }) + .filter( + (x) => + x.isDirectory() && + !x.name.startsWith("(deleted) ") && + !x.name.endsWith(".DS_Store") + ) + .forEach((g) => { + const group = g.name; fs.readdirSync(`${pathToRoot}/${group}`) .filter((x) => !x.startsWith("(deleted) ") && !x.endsWith(".DS_Store")) .forEach((repo) => { diff --git a/package.json b/package.json index 8ec9c0e..df8e3de 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@merrymake/cli", - "version": "4.4.1", + "version": "4.4.2", "description": "", "main": "index.js", "type": "module", diff --git a/publish.sh b/publish.sh index a58b812..e29ad3d 100644 --- a/publish.sh +++ b/publish.sh @@ -1,9 +1,9 @@ tsc -pkg -c pkg.json pkg.js -pushd dist -mv out/mm-win.exe Merrymake-CLI/mm.exe -zip windows.zip Merrymake-CLI/mm.exe Merrymake-CLI/install.ps1 -rm Merrymake-CLI/mm.exe -popd +# pkg -c pkg.json pkg.js +# pushd dist +# mv out/mm-win.exe Merrymake-CLI/mm.exe +# zip windows.zip Merrymake-CLI/mm.exe Merrymake-CLI/install.ps1 +# rm Merrymake-CLI/mm.exe +# popd npm publish --otp=$1 && git add . && git commit -m "Publish" && git push origin HEAD -start https://github.com/merrymake/cli/releases/new \ No newline at end of file +# start https://github.com/merrymake/cli/releases/new \ No newline at end of file