Skip to content

Commit

Permalink
Publish
Browse files Browse the repository at this point in the history
  • Loading branch information
thedrlambda committed Dec 31, 2023
1 parent 3a0adbb commit 489565c
Show file tree
Hide file tree
Showing 8 changed files with 291 additions and 258 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 1.7.0

- Add $broadcast and $join
- Rework sessionId

# 1.6.9

- Add support for local envvars defined in [group]/env.kv in the format "KEY=value\n"
Expand Down
Binary file modified dist/windows.zip
Binary file not shown.
5 changes: 5 additions & 0 deletions executors.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ function clone(struct, name) {
let orgFile = { name };
fs_1.default.writeFileSync(`${name}/.merrymake/conf.json`, JSON.stringify(orgFile));
yield (0, utils_1.execPromise)(`git clone --branch main -q "${config_1.GIT_HOST}/${name}/event-catalogue" event-catalogue`, name);
let dir = `${name}/public`;
fs_1.default.mkdirSync(dir, { recursive: true });
yield (0, utils_1.execPromise)(`git init --initial-branch=main`, dir);
yield (0, utils_1.execPromise)(`git remote add origin "${config_1.GIT_HOST}/${name}/public"`, dir);
// await execPromise(`git fetch`, dir);
fetch(".", name, struct);
}
catch (e) {
Expand Down
8 changes: 8 additions & 0 deletions executors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ async function clone(struct: any, name: string) {
`git clone --branch main -q "${GIT_HOST}/${name}/event-catalogue" event-catalogue`,
name
);
let dir = `${name}/public`;
fs.mkdirSync(dir, { recursive: true });
await execPromise(`git init --initial-branch=main`, dir);
await execPromise(
`git remote add origin "${GIT_HOST}/${name}/public"`,
dir
);
// await execPromise(`git fetch`, dir);
fetch(".", name, struct);
} catch (e) {
throw e;
Expand Down
206 changes: 59 additions & 147 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 489565c

Please sign in to comment.