From a0e112d099d27929bff6225ade181eee97bec46d Mon Sep 17 00:00:00 2001 From: Marc Brugger Date: Tue, 1 Oct 2024 08:19:16 +0200 Subject: [PATCH 1/2] Fix Makefile --- Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 2591dde..eb1a798 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,8 @@ include ./.toolbox.mk # Run go golanci-lint -lint: golangci-lint - $(GOLANGCI_LINT) run --fix +lint: tb.golangci-lint + $(TB_GOLANGCI_LINT) run --fix # Run go mod tidy tidy: @@ -15,16 +15,16 @@ test: tidy lint go tool cover -func=coverage.out # Run tests -release: goreleaser semver - @version=$$($(LOCALBIN)/semver); \ +release: tb.goreleaser tb.semver + @version=$$($(TB_SEMVER)); \ git tag -s $$version -m"Release $$version" - $(GORELEASER) --clean + $(TB_GORELEASER) --clean -test-release: goreleaser - $(GORELEASER) --skip=publish --snapshot --clean +test-release: tb.goreleaser + $(TB_GORELEASER) --skip=publish --snapshot --clean -docs: helm-docs - $(HELM_DOCS) +docs: tb.helm-docs + $(TB_HELM_DOCS) helm-lint: docs helm lint ./chart From 71ad75b358f5bd1dd8ed1d1cc04e12ef82e786cd Mon Sep 17 00:00:00 2001 From: Marc Brugger Date: Tue, 1 Oct 2024 08:28:39 +0200 Subject: [PATCH 2/2] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 34caa87..60c666d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -106,7 +106,7 @@ jobs: go-version-file: "go.mod" - name: Set up Tools - run: make semver helm-docs + run: make tb.semver tb.helm-docs - name: Lint run: |