Skip to content

[DFI-753] migrate swagger to dfinance cosmos-sdk version#218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iTiky merged 4 commits into from
Oct 13, 2020
Merged

[DFI-753] migrate swagger to dfinance cosmos-sdk version #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
041b5a9
[DFI-753] migrate swagger to dfinance cosmos-sdk version
g3co Oct 13, 2020
03849ea
Cosmos SDK version bump, Swagger update
Oct 13, 2020
3e40f8d
Merge branch 'master' into feature-dfi-753_swagger_improvment
Oct 13, 2020
6549258
go mod tidy
Oct 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ cosmos_dir=$(swagger_dir)/cosmos-sdk
dnode = ./cmd/dnode
dncli =./cmd/dncli

cosmos_version = v0.39.1
cosmos_version = dfinance/launchpad

all: install
install: go.sum install-dnode install-dncli
Expand DownExpand Up@@ -58,7 +58,7 @@ swagger-ui-deps:
mkdir -p $(cosmos_dir)

@echo "-> Cosmos-SDK $(cosmos_version) checkout"
git -C $(swagger_dir) clone --branch $(cosmos_version) https://github.com/cosmos/cosmos-sdk.git
git -C $(swagger_dir) clone --branch $(cosmos_version) https://github.com/dfinance/cosmos-sdk.git

@echo "-> Fetching Golang libraries: swag, statik"
go get -u github.com/swaggo/swag/cmd/swag
Expand All@@ -71,7 +71,7 @@ swagger-ui-build:
swag init --dir . --output $(swagger_dir) --generalInfo ./cmd/dnode/main.go --parseDependency

@echo "-> Merging swagger files"
go-swagger-merger -o ./cmd/dncli/docs/swagger.yaml $(swagger_dir)/swagger.yaml $(cosmos_dir)/client/lcd/swagger-ui/swagger.yaml
go-swagger-merger -o ./cmd/dncli/docs/swagger.yaml $(swagger_dir)/swagger.yaml $(cosmos_dir)/client/lcd/swagger-auto/swagger.yaml

@echo "-> Building swagger.go file"
echo "// Code generated by Makefile. DO NOT EDIT.\n" > ./cmd/dncli/docs/swagger.go
Expand Down
Loading