Skip to content

CMP-4464: Add fmt-check target to gate CI on Go formatting #1300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rhmdnd wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −4
Open

CMP-4464: Add fmt-check target to gate CI on Go formatting #1300

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,9 @@ simplify: ## Run go fmt -s against code.
fmt: ## Run go fmt against code.
$(GO) fmt ./...

fmt-check: ## Fail if any code is not formatted with go fmt.
@test -z "$$(gofmt -l $(SRC))" || { echo "The following files need gofmt:"; gofmt -l $(SRC); echo "Run 'make fmt' to fix formatting."; exit 1; }

vet: ## Run go vet against code.
$(GO) vet $(PKGS)

Expand Down Expand Up @@ -421,7 +424,7 @@ images: image bundle-image ## Build operator and bundle images.
images-extra: openscap-image e2e-content-images ## Build the openscap and test content images.

.PHONY: build
build: generate fmt vet test-unit ## Build the operator binary.
build: generate fmt-check vet test-unit ## Build the operator binary.
$(GO) build \
-trimpath \
-ldflags=-buildid= \
Expand Down Expand Up @@ -490,7 +493,7 @@ catalog-docker: opm ## Prepare the catalog dockerfile and the catalog json file.
catalog: catalog-image catalog-push ## Build and push a catalog image.

.PHONY: run
run: manifests generate fmt vet ## Run a controller from your host.
run: manifests generate fmt-check vet ## Run a controller from your host.
$(GO) run ./$(MAIN_PKG)


Expand Down Expand Up @@ -576,15 +579,15 @@ catalog-push: ## Push a catalog image.
##@ Testing

.PHONY: test-unit
test-unit: fmt ## Run the unit tests
test-unit: fmt-check ## Run the unit tests
ifndef JUNITFILE
@$(GO) test $(TEST_OPTIONS) $(PKGS)
else
@set -o pipefail; $(GO) test $(TEST_OPTIONS) -json $(PKGS) --ginkgo.noColor | gotest2junit -v > $(JUNITFILE)
endif

.PHONY: test-coverage
test-coverage: fmt ## Run the unit tests and generate a coverage report
test-coverage: fmt-check ## Run the unit tests and generate a coverage report
@$(GO) test -cover -coverprofile=coverage.out $(PKGS)
@$(GO) tool cover -func coverage.out

Expand Down
Loading