Skip to content

Commit e4a1db5

Browse files
committed
Merge remote-tracking branch 'origin/main' into synthetic-source
2 parents 4a282b5 + 4bb435c commit e4a1db5

File tree

11 files changed

+256
-29
lines changed

11 files changed

+256
-29
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ filter-for-serverless: ## Generate the serverless version from the compiled sche
5757
dump-routes: ## Create a new schema with all generics expanded
5858
@npm run dump-routes --prefix compiler
5959

60-
contrib: | generate license-check spec-format-fix transform-to-openapi filter-for-serverless ## Pre contribution target
61-
6260
overlay-docs: ## Apply overlays to OpenAPI documents
6361
@npx bump overlay "output/openapi/elasticsearch-serverless-openapi.json" "docs/overlays/elasticsearch-serverless-openapi-overlays.yaml" > "output/openapi/elasticsearch-serverless-openapi.tmp1.json"
6462
@npx bump overlay "output/openapi/elasticsearch-serverless-openapi.tmp1.json" "docs/overlays/elasticsearch-shared-overlays.yaml" > "output/openapi/elasticsearch-serverless-openapi.tmp2.json"
@@ -78,6 +76,8 @@ lint-docs-errs: ## Lint the OpenAPI documents after overlays and return only err
7876
lint-docs-serverless: ## Lint only the serverless OpenAPI document after overlays
7977
@npx @stoplight/spectral-cli lint output/openapi/elasticsearch-serverless-openapi.examples.json --ruleset .spectral.yaml
8078

79+
contrib: | generate license-check spec-format-fix transform-to-openapi filter-for-serverless lint-docs-errs ## Pre contribution target
80+
8181
help: ## Display help
8282
@awk 'BEGIN {FS = ":.*##"; printf "Usage:\n make \033[36m<target>\033[0m\n"} /^[a-zA-Z_-]+:.*?##/ { printf " \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
8383
#------------- <https://suva.sh/posts/well-documented-makefiles> --------------

output/openapi/elasticsearch-openapi.json

Lines changed: 43 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

output/openapi/elasticsearch-serverless-openapi.json

Lines changed: 43 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

output/schema/schema-serverless.json

Lines changed: 69 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)