From 2d7ee7ad508197fd8f715125dc9ec58491e33a5b Mon Sep 17 00:00:00 2001
From: Adam Janikowski <12255597+ajanikow@users.noreply.github.com>
Date: Thu, 14 Sep 2023 13:54:27 +0200
Subject: [PATCH] [Maintenance] Require vulncheck in the pipeline (#1407)

---
 .travis.yml |  5 ++---
 Makefile    | 10 +++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 45e6dc8cb..8d09407c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,7 @@ git:
   depth: false
 
 go:
-  - "1.19"
-  - "1.20"
+  - "1.20.8"
 
 go_import_path: github.com/arangodb/kube-arangodb
 
@@ -17,7 +16,7 @@ script:
     set -e
     if [ "$TRAVIS_PULL_REQUEST" != "false" ] || [ ! -z "$ALWAYS" ]; then
       make init
-      make license-verify license-range-verify fmt-verify linter
+      make license-verify license-range-verify fmt-verify linter vulncheck
       make run-unit-tests
       make bin
     else
diff --git a/Makefile b/Makefile
index 2a7d8e15d..19cfd1acf 100644
--- a/Makefile
+++ b/Makefile
@@ -286,9 +286,13 @@ linter:
 linter-fix:
 	@$(GOPATH)/bin/golangci-lint run --fix --build-tags "$(GOBUILDTAGS)" $(foreach LINT_EXCLUDE,$(LINT_EXCLUDES),--exclude '$(LINT_EXCLUDE)') ./...
 
-.PHONY: vulncheck
+.PHONY: vulncheck vulncheck-optional
 vulncheck:
-	@echo ">> Checking for known vulnerabilities"
+	@echo ">> Checking for known vulnerabilities (required)"
+	@$(GOPATH)/bin/govulncheck --tags $(GOBUILDTAGS) ./...
+
+vulncheck-optional:
+	@echo ">> Checking for known vulnerabilities (optional)"
 	@-$(GOPATH)/bin/govulncheck --tags $(GOBUILDTAGS) ./...
 
 .PHONY: build
@@ -684,7 +688,7 @@ check-community:
 	@$(MAKE) _check RELEASE_MODE=community
 
 _check: sync-crds
-	@$(MAKE) fmt yamlfmt license-verify linter run-unit-tests bin vulncheck
+	@$(MAKE) fmt yamlfmt license-verify linter run-unit-tests bin vulncheck-optional
 
 generate: generate-internal generate-proto fmt