Build before zipping, fixes #29; add flag to build caddy with debug s…

…ymbols
infogulch · Jan 7, 2025 · e9c0554 · e9c0554
1 parent b5e5c85
commit e9c0554
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/make_tool.cue b/make_tool.cue
@@ -131,7 +131,7 @@ task: dist: {
 			mkdir: file.MkdirAll & {path: dir, $after: rmdist.$done}
 			build: task.build & {"vars": vars, outfile: "\(dir)/\(exe)", gobuild: {$after: mkdir.$done, "env": env & vars.env}}
 			cp: exec.Run & {cmd: ["cp", "README.md", "LICENSE", "\(dir)"], $after: mkdir.$done}
-			zip: exec.Run & {cmd: ["zip", "-jqr6", "\(dir)_\(vars.version).zip", dir], $after: cp.$done && build.$done}
+			zip: exec.Run & {cmd: ["zip", "-jqr6", "\(dir)_\(vars.version).zip", dir], $after: cp.$done & build.gobuild.$done}
 		}
 	}
 }
@@ -185,6 +185,8 @@ task: push_docker: {
 task: build_caddy: {
 	vars: #vars
 
+	flag: *"" | string @tag(debug,short=debug)
+
 	xbuild: exec.Run & {
 		cmd: ["bash", "-c",
 			"xcaddy build " +
@@ -195,7 +197,10 @@ task: build_caddy: {
 			"&>\(vars.testdir)/xcaddy.log",
 		]
 		dir: vars.rootdir
-		env: vars.env & {CGO_ENABLED: "1"}
+		env: vars.env & {
+			CGO_ENABLED: "1"
+			if flag == "debug" {XCADDY_DEBUG: "1"}
+		}
 	}
 }