From 1ef74353b6734005da1fe04cfd44aee7a3b54a38 Mon Sep 17 00:00:00 2001 From: Scott Winkler Date: Wed, 25 Oct 2023 08:31:29 -0700 Subject: [PATCH] remove check-fmt --- .github/workflows/docs-and-format.yml | 3 ++- Makefile | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docs-and-format.yml b/.github/workflows/docs-and-format.yml index f09aaf0fde..06a6db9527 100644 --- a/.github/workflows/docs-and-format.yml +++ b/.github/workflows/docs-and-format.yml @@ -21,4 +21,5 @@ jobs: go-version-file: ./go.mod cache: false - run: make docs-check - - run: make fmt-check + - run: if [ "$(gofmt -l . | wc -l)" -gt 0 ]; then exit 1; fi + name: check gofmt diff --git a/Makefile b/Makefile index 451a3ead68..0b0cf58ada 100644 --- a/Makefile +++ b/Makefile @@ -26,9 +26,6 @@ docs-check: docs ## check that docs have been generated fmt: terraform-fmt ## Run terraform fmt and gofumpt gofumpt -l -w . -fmt-check: fmt ## check that terraform fmt and gofumt have been run - git diff --exit-code -- . - terraform-fmt: ## Run terraform fmt terraform fmt -recursive ./examples/ terraform fmt -recursive ./pkg/resources/testdata/