Skip to content

Commit bc70e64

Browse files
committed
fix makefile
1 parent 9a70190 commit bc70e64

File tree

1 file changed

+17
-19
lines changed

1 file changed

+17
-19
lines changed

Makefile

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
11
# Include toolbox tasks
22
include ./.toolbox.mk
33

4-
5-
64
# generate mocks
7-
mocks: mockgen
8-
$(MOCKGEN) -destination pkg/mocks/lifecycle/mock.go github.com/bakito/batch-job-controller/pkg/lifecycle Controller
9-
$(MOCKGEN) -destination pkg/mocks/logr/mock.go github.com/go-logr/logr LogSink
10-
$(MOCKGEN) -destination pkg/mocks/record/mock.go k8s.io/client-go/tools/record EventRecorder
11-
$(MOCKGEN) -destination pkg/mocks/client/mock.go sigs.k8s.io/controller-runtime/pkg/client Client,Reader
12-
$(MOCKGEN) -destination pkg/mocks/manager/mock.go sigs.k8s.io/controller-runtime/pkg/manager Manager
5+
mocks: tb.mockgen
6+
$(TB_MOCKGEN) -destination pkg/mocks/lifecycle/mock.go github.com/bakito/batch-job-controller/pkg/lifecycle Controller
7+
$(TB_MOCKGEN) -destination pkg/mocks/logr/mock.go github.com/go-logr/logr LogSink
8+
$(TB_MOCKGEN) -destination pkg/mocks/record/mock.go k8s.io/client-go/tools/record EventRecorder
9+
$(TB_MOCKGEN) -destination pkg/mocks/client/mock.go sigs.k8s.io/controller-runtime/pkg/client Client,Reader
10+
$(TB_MOCKGEN) -destination pkg/mocks/manager/mock.go sigs.k8s.io/controller-runtime/pkg/manager Manager
1311

1412
# Run go mod tidy
1513
tidy:
1614
go mod tidy
1715

1816
# Run tests
19-
test: ginkgo tidy mocks
20-
$(GINKGO) --cover -r -output-dir=. -coverprofile=coverage.out
17+
test: tb.ginkgo tidy mocks
18+
$(TB_GINKGO) --cover -r -output-dir=. -coverprofile=coverage.out
2119

2220
lint: golangci-lint
23-
$(GOLANGCI_LINT) run --fix
21+
$(TB_GOLANGCI_LINT) run --fix
2422

2523
# Run tests
2624
helm-lint: helm
@@ -37,27 +35,27 @@ build-docker:
3735
build-podman:
3836
podman build --build-arg upx_brute=" " -t batch-job-controller .
3937

40-
release: semver
41-
@version=$$(semver); \
38+
release: tb.semver
39+
@version=$$($(TB_SEMVER)); \
4240
git tag -s $$version -m"Release $$version"
4341
goreleaser --clean
4442

4543
test-release:
4644
goreleaser --skip=publish --snapshot --clean
4745

48-
tools: mockgen ginkgo helm
46+
tools: tb.mockgen tb.ginkgo helm
4947

5048
helm:
5149
ifeq (, $(shell which helm))
5250
$(shell curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash)
5351
endif
5452

55-
docs: helm-docs update-docs
56-
@$(LOCALBIN)/helm-docs
53+
docs: tb.helm-docs update-docs
54+
@$(TB_HELM_DOCS)
5755

58-
update-docs: semver
59-
@version=$$($(LOCALBIN)/semver -next); \
60-
versionNum=$$($(LOCALBIN)/semver -next -numeric); \
56+
update-docs: tb.semver
57+
@version=$$($(TB_SEMVER) -next); \
58+
versionNum=$$($(TB_SEMVER) -next -numeric); \
6159
sed -i "s/^version:.*$$/version: $${versionNum}/" ./helm/example-batch-job-controller/Chart.yaml; \
6260
sed -i "s/^appVersion:.*$$/appVersion: $${version}/" ./helm/example-batch-job-controller/Chart.yaml
6361

0 commit comments

Comments
 (0)