From f8a5bba73d8a0094fffe3403d2f08dda5d56cfed Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Fri, 15 May 2026 21:29:45 -0500 Subject: [PATCH] fix: update Makefile go commands for src/ workspace layout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix go generate, go build, go get, and govulncheck to use ./src/... instead of ./... — required for go.work workspace resolution. Co-Authored-By: Claude Opus 4.6 (1M context) --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 3705561f1a..fca7d47594 100644 --- a/Makefile +++ b/Makefile @@ -501,17 +501,17 @@ generate-backend: $(TAGS_PREREQ) generate-go .PHONY: generate-go generate-go: $(TAGS_PREREQ) @echo "Running go generate..." - @CC= GOOS= GOARCH= CGO_ENABLED=0 $(GO) generate -tags '$(TAGS)' ./... + @CC= GOOS= GOARCH= CGO_ENABLED=0 $(GO) generate -tags '$(TAGS)' ./src/... .PHONY: security-check security-check: - GOEXPERIMENT= go run $(GOVULNCHECK_PACKAGE) -show color ./... || true + GOEXPERIMENT= go run $(GOVULNCHECK_PACKAGE) -show color ./src/... || true $(EXECUTABLE): $(GO_SOURCES) $(TAGS_PREREQ) ifneq ($(and $(STATIC),$(findstring pam,$(TAGS))),) $(error pam support set via TAGS does not support static builds) endif - CGO_ENABLED="$(CGO_ENABLED)" CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(EXTLDFLAGS) $(LDFLAGS)' -o $@ + CGO_ENABLED="$(CGO_ENABLED)" CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(EXTLDFLAGS) $(LDFLAGS)' -o $@ ./src .PHONY: release release: frontend generate release-windows release-linux release-darwin release-freebsd release-copy release-compress vendor release-sources release-check @@ -599,7 +599,7 @@ update: update-go update-js update-py ## update dependencies .PHONY: update-go update-go: ## update go dependencies - $(GO) get -u ./... + $(GO) get -u ./src/... $(MAKE) tidy .PHONY: update-js