From fa141116072e000ac996abb1b184b0dbff509177 Mon Sep 17 00:00:00 2001 From: Andrew Block Date: Fri, 16 Feb 2024 09:55:19 -0600 Subject: [PATCH] Improvements to Makefile Signed-off-by: Andrew Block --- Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index e99a021d..9147383f 100644 --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ internal/ml_metadata/proto/%.pb.go: api/grpc/ml_metadata/proto/%.proto gen/grpc: internal/ml_metadata/proto/metadata_store.pb.go internal/ml_metadata/proto/metadata_store_service.pb.go internal/converter/generated/converter.go: internal/converter/*.go - goverter gen github.com/opendatahub-io/model-registry/internal/converter/ + ${GOVERTER} gen github.com/opendatahub-io/model-registry/internal/converter/ .PHONY: gen/converter gen/converter: gen/grpc internal/converter/generated/converter.go @@ -67,7 +67,7 @@ gen/converter: gen/grpc internal/converter/generated/converter.go # validate the openapi schema .PHONY: openapi/validate openapi/validate: bin/openapi-generator-cli - @openapi-generator-cli validate -i api/openapi/model-registry.yaml + ${OPENAPI_GENERATOR} validate -i api/openapi/model-registry.yaml # generate the openapi server implementation .PHONY: gen/openapi-server @@ -86,7 +86,7 @@ gen/openapi: bin/openapi-generator-cli openapi/validate pkg/openapi/client.go pkg/openapi/client.go: bin/openapi-generator-cli api/openapi/model-registry.yaml rm -rf pkg/openapi - openapi-generator-cli generate \ + ${OPENAPI_GENERATOR} generate \ -i api/openapi/model-registry.yaml -g go -o pkg/openapi --package-name openapi \ --ignore-file-override ./.openapi-generator-ignore --additional-properties=isGoSubmodule=true,enumClassPrefix=true,useOneOfDiscriminatorLookup=true gofmt -w pkg/openapi @@ -112,9 +112,11 @@ bin/protoc-gen-go: bin/protoc-gen-go-grpc: GOBIN=$(PROJECT_BIN) go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 +GOLANGCI_LINT ?= ${PROJECT_BIN}/golangci-lint bin/golangci-lint: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(PROJECT_BIN) v1.54.2 +GOVERTER ?= ${PROJECT_BIN}/goverter bin/goverter: GOBIN=$(PROJECT_PATH)/bin go install github.com/jmattheis/goverter/cmd/goverter@v1.1.1 @@ -161,8 +163,8 @@ gen: deps gen/grpc gen/openapi gen/openapi-server gen/converter .PHONY: lint lint: - golangci-lint run main.go - golangci-lint run cmd/... internal/... ./pkg/... + ${GOLANGCI_LINT} run main.go + ${GOLANGCI_LINT} run cmd/... internal/... ./pkg/... .PHONY: test test: gen