summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.drone.yml10
-rw-r--r--Makefile4
2 files changed, 2 insertions, 12 deletions
diff --git a/.drone.yml b/.drone.yml
index f2b34ef7e3..5127b54377 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 4ca346c63e..4d78944de1 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 $@