Skip to content

Commit 0a564ea

Browse files
authored
Remove vendor directory (#53)
* Remove the vendor directory * Add the vendor directory to .gitignore * Adapt Makefile for vendorless tests * Remove module vendoring on test workflow Also: * Simplify workflow triggers * Bump Go to 1.16 for consistency with the release workflow
1 parent 55fdc91 commit 0a564ea

File tree

1,848 files changed

+9
-775084
lines changed

Some content is hidden

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

1,848 files changed

+9
-775084
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
on:
22
push:
3-
branches: "*"
43
pull_request:
5-
branches: "*"
64
workflow_dispatch:
75

86
jobs:
@@ -14,14 +12,11 @@ jobs:
1412
- name: Install
1513
uses: actions/setup-go@v2
1614
with:
17-
go-version: ^1.14
15+
go-version: ^1.16
1816

1917
- name: Checkout
2018
uses: actions/checkout@v2
2119

22-
- name: Vendor # FIXME: remove this step when migrating to pure Go modules.
23-
run: go mod vendor
24-
2520
- name: Build
2621
run: make build
2722

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,7 @@ override.tf.json
3636
# Ignore CLI configuration files
3737
.terraformrc
3838
terraform.rc
39-
terraform
39+
terraform
40+
41+
# Ignore the Go vendor directory, superseded by proxy.golang.org and go.{mod,sum}
42+
vendor

Makefile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
TEST?=$$(go list ./... | grep -v 'vendor')
21
HOSTNAME=github.com
32
NAMESPACE=iterative
43
NAME=iterative
@@ -16,9 +15,8 @@ install: build
1615
mkdir -p ~/.terraform.d/plugins/${HOSTNAME}/${NAMESPACE}/${NAME}/${VERSION}/${OS_ARCH}
1716
mv ${BINARY} ~/.terraform.d/plugins/${HOSTNAME}/${NAMESPACE}/${NAME}/${VERSION}/${OS_ARCH}
1817

19-
test:
20-
go test -i $(TEST) || exit 1
21-
echo $(TEST) | xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=4
18+
test:
19+
go test ./... $(TESTARGS) -timeout=30s -parallel=4
2220

23-
testacc:
24-
TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m
21+
testacc:
22+
TF_ACC=1 go test ./... -v $(TESTARGS) -timeout 120m

vendor/github.com/Azure/azure-sdk-for-go/LICENSE

Lines changed: 0 additions & 202 deletions
This file was deleted.

vendor/github.com/Azure/azure-sdk-for-go/NOTICE

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)