Skip to content

Commit 2d7ee7a

Browse files
authored
[Maintenance] Require vulncheck in the pipeline (#1407)
1 parent 0beb061 commit 2d7ee7a

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ git:
44
depth: false
55

66
go:
7-
- "1.19"
8-
- "1.20"
7+
- "1.20.8"
98

109
go_import_path: github.com/arangodb/kube-arangodb
1110

@@ -17,7 +16,7 @@ script:
1716
set -e
1817
if [ "$TRAVIS_PULL_REQUEST" != "false" ] || [ ! -z "$ALWAYS" ]; then
1918
make init
20-
make license-verify license-range-verify fmt-verify linter
19+
make license-verify license-range-verify fmt-verify linter vulncheck
2120
make run-unit-tests
2221
make bin
2322
else

Makefile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -286,9 +286,13 @@ linter:
286286
linter-fix:
287287
@$(GOPATH)/bin/golangci-lint run --fix --build-tags "$(GOBUILDTAGS)" $(foreach LINT_EXCLUDE,$(LINT_EXCLUDES),--exclude '$(LINT_EXCLUDE)') ./...
288288

289-
.PHONY: vulncheck
289+
.PHONY: vulncheck vulncheck-optional
290290
vulncheck:
291-
@echo ">> Checking for known vulnerabilities"
291+
@echo ">> Checking for known vulnerabilities (required)"
292+
@$(GOPATH)/bin/govulncheck --tags $(GOBUILDTAGS) ./...
293+
294+
vulncheck-optional:
295+
@echo ">> Checking for known vulnerabilities (optional)"
292296
@-$(GOPATH)/bin/govulncheck --tags $(GOBUILDTAGS) ./...
293297

294298
.PHONY: build
@@ -684,7 +688,7 @@ check-community:
684688
@$(MAKE) _check RELEASE_MODE=community
685689

686690
_check: sync-crds
687-
@$(MAKE) fmt yamlfmt license-verify linter run-unit-tests bin vulncheck
691+
@$(MAKE) fmt yamlfmt license-verify linter run-unit-tests bin vulncheck-optional
688692

689693
generate: generate-internal generate-proto fmt
690694

0 commit comments

Comments
 (0)