build: remove cicheck (#2553)

Make cicheck is equvalent to shortcheck due to wrong redis build tag use, see #1854 This change removes redis build tag, build comments and replaces cicheck with the shortcheck target. Fixes #1854 Signed-off-by: Alexander Yastrebov <[email protected]>
zalando · Aug 31, 2023 · 430106d · 430106d
1 parent 3c2525e
commit 430106d
Show file tree

Hide file tree

Showing 13 changed files with 2 additions and 33 deletions.
diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
@@ -20,11 +20,9 @@ jobs:
       - run: go version
       - run: make deps
       - run: make check-fmt
-      - run: make build
       - run: make vet
       - run: make staticcheck
       - run: make check-race
-      - run: make cicheck
       - run: make osv-scanner
       - run: make gosec
       - run: make govulncheck

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -40,4 +40,4 @@ jobs:
       - run: make check-fmt
       - run: make vet
       - run: make staticcheck
-      - run: make cicheck
+      - run: make shortcheck
diff --git a/Makefile b/Makefile
@@ -81,10 +81,6 @@ check: build check-plugins ## run all tests
 shortcheck: build check-plugins fixlimits  ## run all short tests
 	go test -test.short ./...
 
-.PHONY: cicheck
-cicheck: build check-plugins ## run all short and redis tests
-	go test -tags=redis -test.short ./...
-
 .PHONY: check-race
 check-race: build ## run all short tests with race checker
 	go test -race -test.short ./...

diff --git a/circuit/registry_test.go b/circuit/registry_test.go
@@ -1,5 +1,3 @@
-/* +build !race */
-
 package circuit
 
 import (

diff --git a/dataclients/routestring/example_test.go b/dataclients/routestring/example_test.go
@@ -1,6 +1,3 @@
-//go:build !race
-// +build !race
-
 package routestring_test
 
 import (

diff --git a/delivery.yaml b/delivery.yaml
@@ -50,7 +50,7 @@ pipeline:
       fi
       export IMAGE MULTIARCH_IMAGE
 
-      make deps cicheck staticcheck gosec
+      make deps check-fmt vet staticcheck gosec shortcheck
 
       if [[ $CDP_TARGET_BRANCH == master && ! $CDP_PULL_REQUEST_NUMBER ]]; then
         echo "Creating git tag: ${RELEASE_VERSION}"

diff --git a/etcd/etcdtime_test.go b/etcd/etcdtime_test.go
@@ -1,6 +1,3 @@
-//go:build !race
-// +build !race
-
 package etcd
 
 import (

diff --git a/metrics/codahalenorace_test.go b/metrics/codahalenorace_test.go
@@ -1,5 +1,3 @@
-/* +build !race */
-
 package metrics
 
 import (

diff --git a/plugins_test.go b/plugins_test.go
@@ -1,6 +1,3 @@
-//go:build !race
-// +build !race
-
 package skipper
 
 import "testing"

diff --git a/proxy/backendratelimit_test.go b/proxy/backendratelimit_test.go
@@ -1,6 +1,3 @@
-//go:build !race || redis
-// +build !race redis
-
 package proxy_test
 
 import (

diff --git a/proxy/breaker_test.go b/proxy/breaker_test.go
@@ -1,6 +1,3 @@
-//go:build !race
-// +build !race
-
 package proxy_test
 
 import (

diff --git a/ratelimit/cluster_test.go b/ratelimit/cluster_test.go
@@ -1,6 +1,3 @@
-//go:build !race || redis
-// +build !race redis
-
 package ratelimit
 
 import (

diff --git a/ratelimit/swim_test.go b/ratelimit/swim_test.go
@@ -1,6 +1,3 @@
-//go:build !race
-// +build !race
-
 package ratelimit
 
 import (