clean up

marshallford · Aug 17, 2024 · 97b173f · 97b173f
1 parent 01e46c7
commit 97b173f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,12 +20,6 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
-    - name: Setup go
-      uses: actions/setup-go@v5
-      with:
-        go-version-file: .go-version
-    - name: Download dependencies
-      run: go mod download
     - name: Setup Terraform
       uses: hashicorp/setup-terraform@v3
       with:
@@ -60,12 +54,14 @@ jobs:
       with:
         go-version-file: .go-version
         cache: true
+    - name: Download dependencies
+      run: go mod download
     - name: Setup Terraform
       uses: hashicorp/setup-terraform@v3
       with:
         terraform_wrapper: false
-    - name: Generate docs
-      run: make docs
+    - name: Generate and validate docs
+      run: make docs test/docs
     - name: Check docs
       run: |
         GIT_STATUS=$(git status --porcelain)
@@ -103,7 +99,7 @@ jobs:
     - name: Setup external dependencies
       run: make deps
     - name: Test
-      run: make test
+      run: make test/pkg test/acc
 
   check:
     name: Test

diff --git a/GNUmakefile b/GNUmakefile
@@ -26,10 +26,7 @@ VENV := .venv
 VENV_STAMP := $(VENV)/stamp
 ACTIVATE := . $(VENV)/bin/activate
 
-lint: lint/docs lint/terraform lint/editorconfig lint/shellcheck lint/yamllint lint/go lint/ansible
-
-lint/docs: docs
-	TFENV_TERRAFORM_VERSION=$(TERRAFORM_VERSION) go run github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs validate
+lint: lint/terraform lint/editorconfig lint/shellcheck lint/yamllint lint/go lint/ansible
 
 lint/terraform:
 	terraform fmt -recursive -check
@@ -52,7 +49,10 @@ lint/ansible: bin/ansible-navigator
 install:
 	go install
 
-test: test/pkg test/acc
+test: test/docs test/pkg test/acc
+
+test/docs:
+	TFENV_TERRAFORM_VERSION=$(TERRAFORM_VERSION) go run github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs validate
 
 test/pkg:
 	go test ./pkg/... -v $(TESTARGS) -timeout 60m
@@ -73,4 +73,4 @@ $(VENV_STAMP): requirements.txt
 	$(ACTIVATE); pip install -qr requirements.txt
 	touch $(VENV_STAMP)
 
-.PHONY: lint lint/docs lint/terraform lint/editorconfig lint/shellcheck lint/yamllint lint/go lint/ansible install test test/pkg test/acc docs deps bin/ansible-navigator
+.PHONY: lint lint/terraform lint/editorconfig lint/shellcheck lint/yamllint lint/go lint/ansible install test test/docs test/pkg test/acc docs deps bin/ansible-navigator