diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml index 2077208b641..b3400f9a8be 100644 --- a/.github/workflows/goreleaser.yml +++ b/.github/workflows/goreleaser.yml @@ -26,9 +26,7 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Set up swagger run: | - download_url="https://github.com/go-swagger/go-swagger/releases/download/v0.30.4/swagger_linux_amd64" - curl -o /usr/local/bin/swagger -L'#' "$download_url" - chmod +x /usr/local/bin/swagger + go install github.com/go-swagger/go-swagger/cmd/swagger@latest - name: Run GoReleaser uses: goreleaser/goreleaser-action@v4 with: diff --git a/Makefile b/Makefile index e1489cb9787..ae96f63928f 100644 --- a/Makefile +++ b/Makefile @@ -103,6 +103,10 @@ clean-swagger: @rm -rf models @rm -rf api/operations +install-go-swagger: + @echo "installing latest go-swagger" + @go install github.com/go-swagger/go-swagger/cmd/swagger@latest + swagger-operator: @echo "Generating swagger server code from yaml" @swagger generate server -A operator --main-package=operator --server-package=api --exclude-main -P models.Principal -f ./swagger.yml -r NOTICE @@ -110,7 +114,7 @@ swagger-operator: @npx swagger-typescript-api -p ./swagger.yml -o ./web-app/src/api -n operatorApi.ts @(cd web-app && npm install -g prettier && prettier -w .) -swagger-gen: clean-swagger swagger-operator apply-gofmt +swagger-gen: install-go-swagger clean-swagger swagger-operator apply-gofmt @echo "Done Generating swagger server code from yaml" assets: @@ -171,4 +175,4 @@ models-gen: // along with this program. If not, see .\n\ //\n\ " ./models/{} - @rm -rf client \ No newline at end of file + @rm -rf client