Skip to content

Commit 2fe7047

Browse files
megan07megan07
authored
Revert "remove vendor directory, update makefile (#2003)" (#2060)
This reverts commit d89b746.
1 parent d89b746 commit 2fe7047

File tree

3,599 files changed

+1751824
-2
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,599 files changed

+1751824
-2
lines changed

‎.golangci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
run:
22
deadline: 2m30s
3+
modules-download-mode: vendor
34

45
issues:
56
max-per-linter: 0

‎GNUmakefile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
TEST?=$$(go list ./...)
1+
TEST?=$$(go list ./... |grep -v 'vendor')
22
WEBSITE_REPO=github.com/hashicorp/terraform-website
33
PKG_NAME=google
44
DIR_NAME=google-beta
55

66
GO111MODULE=on
7+
GOFLAGS=-mod=vendor
78

89
default: build
910

1011
build: fmtcheck generate
1112
go install
1213

1314
test: fmtcheck generate
14-
go test $(TESTARGS) -timeout=30s -parallel=4 $(TEST)
15+
go test -i $(TEST) || exit 1
16+
echo $(TEST) | \
17+
xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=4
1518

1619
testacc: fmtcheck
1720
TF_ACC=1 TF_SCHEMA_PANIC_ON_ERROR=1 go test $(TEST) -v $(TESTARGS) -timeout 240m -ldflags="-X=github.com/terraform-providers/terraform-provider-google-beta/version.ProviderVersion=acc"

0 commit comments

Comments
 (0)