From 9380bb6d0c7fb8d2652d19a9aec87994a6e99f8c Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 21 Nov 2022 03:39:00 +0100 Subject: [PATCH] Consolidate security-check into checks-backend (#21882) Also, run it via exact version instead of relying on global binary. --- .drone.yml | 10 ---------- Makefile | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index f2b34ef7e..5127b5437 100644 --- a/.drone.yml +++ b/.drone.yml @@ -39,16 +39,6 @@ steps: - make lint-frontend depends_on: [deps-frontend] - - name: security-check - image: golang:1.19 - pull: always - commands: - - make security-check - depends_on: [deps-backend] - volumes: - - name: deps - path: /go - - name: lint-backend image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env pull: always diff --git a/Makefile b/Makefile index 4ca346c63..4d78944de 100644 --- a/Makefile +++ b/Makefile @@ -333,7 +333,7 @@ checks: checks-frontend checks-backend checks-frontend: lockfile-check svg-check .PHONY: checks-backend -checks-backend: tidy-check swagger-check fmt-check misspell-check swagger-validate +checks-backend: tidy-check swagger-check fmt-check misspell-check swagger-validate security-check .PHONY: lint lint: lint-frontend lint-backend @@ -745,7 +745,7 @@ generate-go: $(TAGS_PREREQ) .PHONY: security-check security-check: - govulncheck -v ./... + go run $(GOVULNCHECK_PACKAGE) -v ./... $(EXECUTABLE): $(GO_SOURCES) $(TAGS_PREREQ) CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@