Merge #83622

83622: build: remove crdb-protobuf-client node_modules with ui-maintainer-clean r=rickystewart a=sjbarag In the master branch, NPM packages are placed in slightly different locations than in v22.1. Ensure make ui-maintainer-clean removes directories that may be leftover from a build of later versions. Release note: None Co-authored-by: Sean Barag <[email protected]>
cockroachdb · Jun 30, 2022 · 2d4acbc · 2d4acbc
2 parents f73bdad + 9b1afea
commit 2d4acbc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -1445,7 +1445,7 @@ ui-clean: ## Remove build artifacts.
 .PHONY: ui-maintainer-clean
 ui-maintainer-clean: ## Like clean, but also remove installed dependencies
 ui-maintainer-clean: ui-clean
-	rm -rf pkg/ui/node_modules pkg/ui/workspaces/db-console/node_modules pkg/ui/yarn.installed pkg/ui/workspaces/cluster-ui/node_modules
+	rm -rf pkg/ui/node_modules pkg/ui/workspaces/db-console/node_modules pkg/ui/yarn.installed pkg/ui/workspaces/cluster-ui/node_modules pkg/ui/workspaces/db-console/src/js/node_modules
 
 pkg/roachprod/vm/aws/embedded.go: bin/.bootstrap pkg/roachprod/vm/aws/config.json pkg/roachprod/vm/aws/old.json bin/terraformgen
 	(cd pkg/roachprod/vm/aws && $(GO) generate)