Commit4c10190

committed

fix(Makefile): fix dcspec gen dependencies and hide error output

1 parent674f60f commit4c10190Copy full SHA for 4c10190

File tree

+30

-4

lines changed

+30

-4

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -659,8 +659,12 @@ agent/agentcontainers/acmock/acmock.go: agent/agentcontainers/containers.go`
`659`	`659`	`go generate ./agent/agentcontainers/acmock/`
`660`	`660`	`touch"$@"`
`661`	`661`
`662`		`-agent/agentcontainers/dcspec/dcspec_gen.go: agent/agentcontainers/dcspec/devContainer.base.schema.json`
`663`		`-go generate ./agent/agentcontainers/dcspec/`
	`662`	`+agent/agentcontainers/dcspec/dcspec_gen.go:\`
	`663`	`+node_modules/.installed\`
	`664`	`+agent/agentcontainers/dcspec/devContainer.base.schema.json\`
	`665`	`+agent/agentcontainers/dcspec/gen.sh\`
	`666`	`+agent/agentcontainers/dcspec/doc.go`
	`667`	`+DCSPEC_QUIET=true go generate ./agent/agentcontainers/dcspec/`
`664`	`668`	`touch"$@"`
`665`	`669`
`666`	`670`	`$(TAILNETTEST_MOCKS): tailnet/coordinator.go tailnet/service.go`

Lines changed: 24 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,14 +30,36 @@ fi`
`30`	`30`
`31`	`31`	`TMPDIR=$(mktemp -d)`
`32`	`32`	`trap'rm -rfv "$TMPDIR"' EXIT`
`33`		`-pnpmexec quicktype \`
	`33`	`+`
	`34`	`+show_stderr=1`
	`35`	`+exec3>&2`
	`36`	`+if [["$"==" --quiet"* ]]\|\| [[${DCSPEC_QUIET:-false}=="true" ]];then`
	`37`	`+# Redirect stderr to log because quicktype can't infer all types and`
	`38`	`+# we don't care right now.`
	`39`	`+show_stderr=0`
	`40`	`+exec2>"${TMPDIR}/stderr.log"`
	`41`	`+fi`
	`42`	`+`
	`43`	`+if! pnpmexec quicktype \`
`34`	`44`	`--src-lang schema \`
`35`	`45`	`--lang go \`
`36`	`46`	`--just-types-and-package \`
`37`	`47`	`--top-level"DevContainer" \`
`38`	`48`	`--out"${TMPDIR}/${DEST_FILENAME}" \`
`39`	`49`	`--package"dcspec" \`
`40`		`-"${SCHEMA_DEST}"`
	`50`	`+"${SCHEMA_DEST}";then`
	`51`	`+echo"quicktype failed to generate Go code.">&3`
	`52`	`+if [["${show_stderr}"-eq 1 ]];then`
	`53`	`+cat"${TMPDIR}/stderr.log">&3`
	`54`	`+fi`
	`55`	`+exit 1`
	`56`	`+fi`
	`57`	`+`
	`58`	`+if [["${show_stderr}"-eq 0 ]];then`
	`59`	`+# Restore stderr.`
	`60`	`+exec2>&3`
	`61`	`+fi`
	`62`	`+exec3>&-`
`41`	`63`
`42`	`64`	`# Format the generated code.`
`43`	`65`	`go run mvdan.cc/gofumpt@v0.4.0 -w -l"${TMPDIR}/${DEST_FILENAME}"`

Comments

(0)