Run gofmt with golangci-lint

saturncloud · Sep 18, 2024 · 50d95a3 · 50d95a3
1 parent 980e2db
commit 50d95a3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -24,9 +24,7 @@ jobs:
         uses: golangci/golangci-lint-action@v6
         with:
           version: v1.61.0
-          args: --timeout 3m --verbose
-      - name: Formatting
-        run: make format-check
+          args: --verbose
   test:
     name: Tests
     runs-on: ubuntu-latest

diff --git a/.golangci.yaml b/.golangci.yaml
@@ -0,0 +1,5 @@
+run:
+  timeout: 5m
+linters:
+  enable:
+  - gofmt
diff --git a/Makefile b/Makefile
@@ -17,9 +17,6 @@ lint:
 format:
 	@gofmt -l -w ./
 
-format-check:
-	@if test -z $(gofmt -l ./); then gofmt -d ./; exit 1; fi
-
 test: _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/etcd _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/kube-apiserver _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/kubectl
 	TEST_ASSET_ETCD=_test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/etcd \
 	TEST_ASSET_KUBE_APISERVER=_test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/kube-apiserver \