From 69eeeedb13e02ea64b142d4f03e151dc5f496da2 Mon Sep 17 00:00:00 2001 From: Guillermo Prandi Date: Tue, 3 Sep 2019 23:22:11 -0300 Subject: [PATCH 1/4] Change current dir for go get swagger so it doesn't modify go.mod --- Makefile | 4 ++++ remove.me | 1 + 2 files changed, 5 insertions(+) create mode 100644 remove.me diff --git a/Makefile b/Makefile index 69f352a8abb57..9587983f6b20c 100644 --- a/Makefile +++ b/Makefile @@ -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/swagger@v0.20.1; \ + cd gitea ; \ fi swagger generate spec -o './$(SWAGGER_SPEC)' $(SED_INPLACE) '$(SWAGGER_SPEC_S_TMPL)' './$(SWAGGER_SPEC)' @@ -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/swagger@v0.20.1; \ + cd gitea ; \ fi $(SED_INPLACE) '$(SWAGGER_SPEC_S_JSON)' './$(SWAGGER_SPEC)' swagger validate './$(SWAGGER_SPEC)' diff --git a/remove.me b/remove.me new file mode 100644 index 0000000000000..6d1efbf8f22b6 --- /dev/null +++ b/remove.me @@ -0,0 +1 @@ +This is a test file. Please remove me. From b876cfed47b1084fd05f225f09b5b79f08232698 Mon Sep 17 00:00:00 2001 From: Guillermo Prandi Date: Wed, 4 Sep 2019 02:31:33 -0300 Subject: [PATCH 2/4] Remove leftover file from tests --- remove.me | 1 - 1 file changed, 1 deletion(-) delete mode 100644 remove.me diff --git a/remove.me b/remove.me deleted file mode 100644 index 6d1efbf8f22b6..0000000000000 --- a/remove.me +++ /dev/null @@ -1 +0,0 @@ -This is a test file. Please remove me. From 52bcf0740afa61fe78eea4cb640385c2e3795ff3 Mon Sep 17 00:00:00 2001 From: guillep2k <18600385+guillep2k@users.noreply.github.com> Date: Wed, 4 Sep 2019 03:03:49 -0300 Subject: [PATCH 3/4] Update Makefile as per @lafriks suggestion Co-Authored-By: Lauris BH --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9587983f6b20c..cc693bebbe8d8 100644 --- a/Makefile +++ b/Makefile @@ -104,7 +104,7 @@ 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/swagger@v0.20.1; \ - cd gitea ; \ + cd - ; \ fi swagger generate spec -o './$(SWAGGER_SPEC)' $(SED_INPLACE) '$(SWAGGER_SPEC_S_TMPL)' './$(SWAGGER_SPEC)' From 314dac3f26e1af76e8265971276d85fb4757ef0c Mon Sep 17 00:00:00 2001 From: guillep2k <18600385+guillep2k@users.noreply.github.com> Date: Wed, 4 Sep 2019 03:04:00 -0300 Subject: [PATCH 4/4] Update Makefile as per @lafriks suggestion Co-Authored-By: Lauris BH --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cc693bebbe8d8..4c19572be47c0 100644 --- a/Makefile +++ b/Makefile @@ -124,7 +124,7 @@ 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/swagger@v0.20.1; \ - cd gitea ; \ + cd - ; \ fi $(SED_INPLACE) '$(SWAGGER_SPEC_S_JSON)' './$(SWAGGER_SPEC)' swagger validate './$(SWAGGER_SPEC)'