diff --git a/Makefile b/Makefile index ed185875d56..940ba716831 100644 --- a/Makefile +++ b/Makefile @@ -127,8 +127,8 @@ OAPI_SPEC_TARGET = public/openapi3.json openapi3-gen: swagger-gen ## Generates OpenApi 3 specs from the Swagger 2 already generated $(GO) run $(GO_RACE_FLAG) scripts/openapi3/openapi3conv.go $(MERGED_SPEC_TARGET) $(OAPI_SPEC_TARGET) -.PHONY: all-openapi3-gen -all-openapi3-gen: openapi3-gen +.PHONY: generate-openapi +generate-openapi: openapi3-gen $(GO) test ./pkg/tests/apis || true yarn workspace @grafana/openapi process-specs diff --git a/packages/grafana-openapi/package.json b/packages/grafana-openapi/package.json index 8b69c61980b..2ae5706372b 100644 --- a/packages/grafana-openapi/package.json +++ b/packages/grafana-openapi/package.json @@ -43,7 +43,7 @@ "copy:dist": "cp ./src/apis/* ./dist/apis && cp ./src/api/* ./dist/api", "create:folders": "mkdir -p dist/api dist/apis", "format": "prettier \"**/*.json\" --write --log-level=warn", - "generate:openapi": "make -C ../../ all-openapi3-gen", + "generate:openapi": "make -C ../../ generate-openapi", "typecheck": "", "prepack": "cp package.json package.json.bak && node ../../scripts/prepare-npm-package.js", "postpack": "mv package.json.bak package.json",