cleanup Makfile

Author: dmacvicar

.github/workflows/test.yml

@@ -1,4 +1,4 @@
-name: Tests
+name: Build and Test
 on:
   pull_request:
     paths-ignore:
@@ -14,13 +14,16 @@ permissions:
   contents: read
   pull-requests: read
 jobs:
-  golangci:
-    name: lint
+  lint:
+    name: Lint
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 2
+      - name: terraform fmt
+        run: |
+          make tflint
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
@@ -46,9 +49,6 @@ jobs:
         uses: actions/checkout@v2
       - name: Setup terraform
         uses: hashicorp/setup-terraform@v1
-      - name: Terraform fmt
-        run: |
-          make tf-check
       - name: Build
         run: |
           make

Makefile

@@ -8,7 +8,7 @@ default: build
 terraform-provider-libvirt:
 	go build -ldflags "${LDFLAGS}"
 
-build: fmt-check lint-check vet-check terraform-provider-libvirt
+build: terraform-provider-libvirt
 
 install:
 	go install -ldflags "${LDFLAGS}"
@@ -20,10 +20,6 @@ install:
 test:
 	go test -v $(TEST_ARGS_DEF) $(TEST_ARGS) ./libvirt
 
-lint:
-	golangci-lint run
-	terraform fmt -write=false -check=true -diff=true examples/
-
 # acceptance tests
 # usage:
 #
@@ -39,22 +35,18 @@ lint:
 testacc:
 	./travis/run-tests-acceptance $(TEST_ARGS)
 
-vet-check:
-	go vet ./libvirt
-
-lint-check:
-	go run golang.org/x/lint/golint -set_exit_status ./libvirt .
-
-fmt-check:
-	go fmt ./libvirt .
+golangcilint:
+	golangci-lint run
 
-tf-check:
+tflint:
 	terraform fmt -write=false -check=true -diff=true examples/
 
+lint: golangcilint tflint
+
 clean:
 	rm -f terraform-provider-libvirt
 
 cleanup:
 	./travis/cleanup.sh
 
-.PHONY: build install test testacc vet-check fmt-check lint-check
+.PHONY: build install test testacc tflint golangcilint lint