diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4e77712d..458d5031 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,6 +40,5 @@ jobs: run: if [[ $(git diff | wc -l) -gt 0 ]]; then echo ">>> Untracked generated files have not been committed" && git --no-pager diff && exit 1; fi - name: Checking if manifests generated untracked files run: test -z "$(git ls-files --others --exclude-standard 2> /dev/null)" - - run: make fmt vet - name: Checking if source code is not formatted run: test -z "$(git diff 2> /dev/null)" diff --git a/Makefile b/Makefile index 3ff2c1a5..79a1e839 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ BUILD_DATE ?= $$(git log -1 --format="%at" | xargs -I{} date -d @{} +%Y-%m- all: manager # Run tests -test: generate fmt vet manifests +test: generate manifests go test ./... -coverprofile cover.out # Build manager binary @@ -44,7 +44,7 @@ manager: generate fmt vet go build -o bin/manager main.go # Run against the configured Kubernetes cluster in ~/.kube/config -run: generate fmt vet manifests +run: generate manifests go run ./main.go # Install CRDs into a cluster @@ -70,14 +70,6 @@ remove: manifests kustomize manifests: controller-gen $(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases -# Run go fmt against code -fmt: - go fmt ./... - -# Run go vet against code -vet: - go vet ./... - # Generate code generate: controller-gen $(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."