[lucene-solr-operator] branch main updated: Restructure some checking logic in Makefile. (#220)

[ho...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

houston pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/lucene-solr-operator.git


The following commit(s) were added to refs/heads/main by this push:
     new 0ed9f62  Restructure some checking logic in Makefile. (#220)
0ed9f62 is described below

commit 0ed9f622eed2d96b1fb47f0c8e01848a1735f160
Author: Houston Putman <ho...@apache.org>
AuthorDate: Wed Feb 17 18:31:01 2021 -0500

    Restructure some checking logic in Makefile. (#220)
---
 .github/workflows/tests.yaml |  2 +-
 Makefile                     | 24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 4788c8d..b019e3f 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -52,5 +52,5 @@ jobs:
       - run: make build
 
       # Test
-      - run: make manifests-check
+      - run: make lint
       - run: make test
\ No newline at end of file
diff --git a/Makefile b/Makefile
index b7e54a3..0d2bda2 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ clean:
 mod-tidy:
 	export GO111MODULE=on; go mod tidy
 
-release: clean manifests helm-check
+release: clean manifests lint
 	VERSION=${VERSION} bash hack/release/update_versions.sh
 	VERSION=${VERSION} bash hack/release/build_helm.sh
 	VERSION=${VERSION} bash hack/release/setup_release.sh
@@ -47,10 +47,6 @@ release: clean manifests helm-check
 build: generate vet
 	BIN=solr-operator VERSION=${VERSION} GIT_SHA=${GIT_SHA} ARCH=${ARCH} GOOS=${GOOS} ./build/build.sh
 
-# Run tests
-test: check-format check-license generate fmt vet manifests
-	go test ./... -coverprofile cover.out
-
 # Run against the configured Kubernetes cluster in ~/.kube/config
 run: generate fmt vet manifests
 	go run ./main.go
@@ -81,19 +77,31 @@ fmt:
 vet:
 	go vet ./...
 
+###
+# Tests and Checks
+###
+
+check: lint test
+
+lint: check-format check-license check-manifests check-helm
+
 check-format:
 	./hack/check_format.sh
 
 check-license:
 	./hack/check_license.sh
 
-manifests-check:
+check-manifests: manifests
 	@echo "Check to make sure the manifests are up to date"
-	git diff --exit-code -- config
+	git diff --exit-code -- config helm/solr-operator/crds
 
-helm-check:
+check-helm:
 	helm lint helm/solr-operator
 
+# Run tests
+test: generate vet manifests
+	go test ./... -coverprofile cover.out
+
 
 # # find or download controller-gen
 # download controller-gen if necessary