Skip to content

Change current dir for go get swagger so it doesn't modify go.mod #8078

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

Closed
wants to merge 5 commits into from
Closed

Change current dir for go get swagger so it doesn't modify go.mod #8078

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
69eeeed
Change current dir for go get swagger so it doesn't modify go.mod
guillep2k Sep 4, 2019
b876cfe
Remove leftover file from tests
guillep2k Sep 4, 2019
52bcf07
Update Makefile as per @lafriks suggestion
guillep2k Sep 4, 2019
314dac3
Update Makefile as per @lafriks suggestion
guillep2k Sep 4, 2019
1986e9d
Merge branch 'master' into ci-swagger-workaround
guillep2k Sep 4, 2019
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
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ generate:
.PHONY: generate-swagger
generate-swagger:
@hash swagger > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
cd .. ; \
GO111MODULE="on" $(GO) get -u github.com/go-swagger/go-swagger/cmd/[email protected]; \
cd gitea ; \
fi
swagger generate spec -o './$(SWAGGER_SPEC)'
$(SED_INPLACE) '$(SWAGGER_SPEC_S_TMPL)' './$(SWAGGER_SPEC)'
Expand All @@ -120,7 +122,9 @@ swagger-check: generate-swagger
.PHONY: swagger-validate
swagger-validate:
@hash swagger > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
cd .. ; \
GO111MODULE="on" $(GO) get -u github.com/go-swagger/go-swagger/cmd/[email protected]; \
cd gitea ; \
fi
$(SED_INPLACE) '$(SWAGGER_SPEC_S_JSON)' './$(SWAGGER_SPEC)'
swagger validate './$(SWAGGER_SPEC)'
Expand Down