Skip to content

Commit 43e7608

Browse files
committed
[ci] Only build dist after all tests are complete
1 parent 9207126 commit 43e7608

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

make_tool.cue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ task: dist: {
142142
matrix: [for os in oses for arch in arches {GOOS: os, GOARCH: arch}]
143143

144144
for env in matrix {
145-
(env.GOOS + "_" + env.GOARCH): {
145+
("dist_" + env.GOOS + "_" + env.GOARCH): {
146146
dir: "\(vars.distdir)/xtemplate-\(env.GOARCH)-\(env.GOOS)"
147147
exe: string | *"xtemplate"
148148
if env.GOOS == "windows" {
@@ -224,7 +224,8 @@ task: build_caddy: {
224224
"xcaddy build " +
225225
"--with github.com/infogulch/xtemplate/caddy=./caddy " +
226226
"--with github.com/infogulch/xtemplate=. " +
227-
"--with github.com/ncruces/go-sqlite3 " +
227+
"--with github.com/ncruces/go-sqlite3/driver " +
228+
"--with github.com/ncruces/go-sqlite3/embed " +
228229
"--output '\(vars.distdir)/caddy\(vars.exeExt)' " +
229230
"&>'\(vars.distdir)/xcaddy.log'",
230231
]
@@ -278,7 +279,7 @@ command: ci: {
278279

279280
pass: build_test_cli.kill.$done && build_test_caddy.kill.$done && build_test_docker.stop.$done
280281

281-
dist: task.dist & {"vars": cfg.vars}
282+
dist: task.dist & {"vars": cfg.vars, [=~"^dist"]: rmdir: $after: pass}
282283
build_docker: task.build_docker & {"vars": cfg.vars, build: $after: pass}
283284
push_docker: task.push_docker & {"vars": cfg.vars, tags: build_docker.tags} & {[=~"^push"]: $after: build_docker.build.$done}
284285
}

0 commit comments

Comments
 (0)