Skip to content

Commit

Permalink
Publish
Browse files Browse the repository at this point in the history
  • Loading branch information
thedrlambda committed Dec 4, 2024
1 parent e70687e commit 8280515
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 14 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 6 additions & 3 deletions Execute.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
12 changes: 9 additions & 3 deletions Execute.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@merrymake/cli",
"version": "4.4.1",
"version": "4.4.2",
"description": "",
"main": "index.js",
"type": "module",
Expand Down
14 changes: 7 additions & 7 deletions publish.sh
Original file line number Diff line number Diff line change
@@ -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
# start https://github.com/merrymake/cli/releases/new

0 comments on commit 8280515

Please sign in to comment.