Remove generate Make target and use in GHA (#14034)

hashicorp · Mar 22, 2023 · 59f7e9b · 59f7e9b
1 parent 5cd80a9
commit 59f7e9b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -28,7 +28,6 @@ jobs:
     - name: Build
       run: |
         make lint
-        make generate
         go build
 
     - name: Test

diff --git a/GNUmakefile b/GNUmakefile
@@ -5,13 +5,13 @@ DIR_NAME=google
 
 default: build
 
-build: lint generate
+build: lint
 	go install
 
-test: lint generate
+test: lint
 	go test $(TESTARGS) -timeout=30s $(TEST)
 
-testacc: generate
+testacc:
 	TF_ACC=1 TF_SCHEMA_PANIC_ON_ERROR=1 go test $(TEST) -v $(TESTARGS) -timeout 240m -ldflags="-X=github.com/hashicorp/terraform-provider-google/version.ProviderVersion=acc"
 
 fmt:
@@ -27,9 +27,6 @@ vet:
 
 lint: fmtcheck vet
 
-generate:
-	go generate  ./...
-
 test-compile:
 	@if [ "$(TEST)" = "./..." ]; then \
 		echo "ERROR: Set TEST to a specific package. For example,"; \
@@ -48,4 +45,4 @@ endif
 docscheck:
 	@sh -c "'$(CURDIR)/scripts/docscheck.sh'"
 
-.PHONY: build test testacc fmt fmtcheck vet lint test-compile website website-test docscheck generate
+.PHONY: build test testacc fmt fmtcheck vet lint test-compile website website-test docscheck