Skip to content

Commit

Permalink
fix: move swagger to spec dir
Browse files Browse the repository at this point in the history
  • Loading branch information
aeneasr committed Apr 25, 2021
1 parent 22ac3bb commit 7f6a061
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ workflows:
- test
- test-race
- validate
swag-spec-location: .schema/swagger.json
swag-spec-location: spec/api.json
swag-spec-ignore: internal/httpclient proto/ory/keto docker
filters:
tags:
Expand All @@ -135,14 +135,14 @@ workflows:
sdk/generate:
appname: Ory_Keto
specignorepgks: internal/httpclient proto/ory/keto docker
swagpath: .schema/swagger.json
swagpath: spec/api.json
requires:
- test
- test-race
- validate
- sdk/release:
specignorepgks: internal/httpclient proto/ory/keto docker
swagpath: .schema/swagger.json
swagpath: spec/api.json
requires:
- test
- test-race
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ docker:
# Generates the SDKs
.PHONY: sdk
sdk: .bin/swagger .bin/cli
swagger generate spec -m -o ./.schema/swagger.json -x internal/httpclient -x proto/ory/keto -x docker
cli dev swagger sanitize ./.schema/swagger.json
swagger flatten --with-flatten=remove-unused -o ./.schema/swagger.json ./.schema/swagger.json
swagger validate ./.schema/swagger.json
swagger generate spec -m -o ./spec/api.json -x internal/httpclient -x proto/ory/keto -x docker
cli dev swagger sanitize ./spec/api.json
swagger flatten --with-flatten=remove-unused -o ./spec/api.json ./spec/api.json
swagger validate ./spec/api.json
rm -rf internal/httpclient
mkdir -p internal/httpclient
swagger generate client -f ./.schema/swagger.json -t internal/httpclient -A Ory_Keto
swagger generate client -f ./spec/api.json -t internal/httpclient -A Ory_Keto
make format

.PHONY: build
Expand Down
File renamed without changes.

0 comments on commit 7f6a061

Please sign in to comment.