starred/windmill
1
0
Fork 0
mirror of https://github.com/windmill-labs/windmill.git synced 2026-10-24 16:04:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove extra_perms from being encoded in non-folder zip export

Browse Source
This commit is contained in:
Ruben Fiszel
2023-02-22 12:55:40 +01:00
parent 08519f4099
commit 4671558e6b
4 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/sync.ts
+8 -5
View File
@@ -26,6 +26,7 @@ import { downloadZip } from "./pull.ts";
import { FolderFile } from "./folder.ts";
import { ResourceTypeFile } from "./resource-type.ts";
import {
handleScriptMetadata,
ScriptFile,
} from "./script.ts";
import { ResourceFile } from "./resource.ts";
@@ -195,7 +196,8 @@ async function compareDynFSElement(
await Deno.writeTextFile("/tmp/k", m2[k])
await Deno.writeTextFile("/tmp/v", v)
console.log(k)
Deno.exit(1)
if (k.includes("variable"))
Deno.exit(1)
changes.push({ name: "edited", path: k, after: v, before: m2[k] });
}
}
@@ -306,7 +308,7 @@ async function pull(
}
}
}
console.log(colors.green.underline(`Done! All ${changes.length} changes applied locally.`));
console.log(colors.green.underline(`Done! All ${changes.length} changes pushed to the remote.`));
}
@@ -404,12 +406,13 @@ async function push(opts: GlobalOptions & { raw: boolean, yes: boolean }) {
return
}
console.log(`Applying changes to files ...`);
const alreadySynced: string[] = []
for await (const change of changes) {
const stateTarget = path.join(Deno.cwd(), ".wmill", change.path)
if (change.name === "edited") {
if (change.path.endsWith(".script.json")) {
if (await handleScriptMetadata(change.path, workspace.workspaceId, alreadySynced)) {
continue
} else if (await handleFile(change.path, change.after, workspace.workspaceId)) {
} else if (await handleFile(change.path, change.after, workspace.workspaceId, alreadySynced)) {
continue
}
if (!opts.raw) {
@@ -431,7 +434,7 @@ async function push(opts: GlobalOptions & { raw: boolean, yes: boolean }) {
} else if (change.name === "added") {
if (change.path.endsWith(".script.json")) {
continue
} else if (await handleFile(change.path, change.content, workspace.workspaceId)) {
} else if (await handleFile(change.path, change.content, workspace.workspaceId, alreadySynced)) {
continue
}
if (!opts.raw) {