Skip to content

Commit 6bb1680

Browse files
committed
Change makefile in v2 scaffolding to use ./...
Previously, we had some spots where we were using `./api/...` and `./controllers/...` specifically. Using `./...` instead allows us to handle cases where we're lacking `api/`, and should otherwise be fine since we don't have a vendor directory.
1 parent 97d6111 commit 6bb1680

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

pkg/scaffold/v2/makefile.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ all: manager
5959
6060
# Run tests
6161
test: generate fmt vet manifests
62-
go test ./api/... ./controllers/... -coverprofile cover.out
62+
go test ./... -coverprofile cover.out
6363
6464
# Build manager binary
6565
manager: generate fmt vet
@@ -92,7 +92,7 @@ vet:
9292
9393
# Generate code
9494
generate: controller-gen
95-
$(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths=./api/...
95+
$(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths="./..."
9696
9797
# Build the docker image
9898
docker-build: test

testdata/project-v2/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ all: manager
1515

1616
# Run tests
1717
test: generate fmt vet manifests
18-
go test ./api/... ./controllers/... -coverprofile cover.out
18+
go test ./... -coverprofile cover.out
1919

2020
# Build manager binary
2121
manager: generate fmt vet
@@ -48,7 +48,7 @@ vet:
4848

4949
# Generate code
5050
generate: controller-gen
51-
$(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths=./api/...
51+
$(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths="./..."
5252

5353
# Build the docker image
5454
docker-build: test

0 commit comments

Comments
 (0)