Skip to content

Commit 1905465

Browse files
authored
Merge pull request #1031 from golangci/disable-vendoring
dev: disable vendoring
2 parents 0d8381c + ef317c4 commit 1905465

File tree

1,603 files changed

+5
-550059
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,603 files changed

+5
-550059
lines changed

Makefile

+5-15
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
# enable module support across all go commands.
55
export GO111MODULE = on
6-
# opt-in to vendor deps across all go commands.
7-
export GOFLAGS = -mod=vendor
86
# enable consistent Go 1.12/1.13 GOPROXY behavior.
97
export GOPROXY = https://proxy.golang.org
108

@@ -46,25 +44,25 @@ test_linters:
4644

4745
# Maintenance
4846

49-
generate: README.md docs/demo.svg install.sh vendor
47+
generate: README.md docs/demo.svg install.sh
5048
.PHONY: generate
5149

52-
fast_generate: README.md vendor
50+
fast_generate: README.md
5351
.PHONY: fast_generate
5452

5553
maintainer-clean: clean
56-
rm -rf docs/demo.svg README.md install.sh vendor
54+
rm -rf docs/demo.svg README.md install.sh
5755
.PHONY: maintainer-clean
5856

5957
check_generated:
6058
$(MAKE) --always-make generate
61-
git checkout -- vendor/modules.txt go.mod go.sum # can differ between go1.12 and go1.13
59+
git checkout -- go.mod go.sum # can differ between go1.12 and go1.13
6260
git diff --exit-code # check no changes
6361
.PHONY: check_generated
6462

6563
fast_check_generated:
6664
$(MAKE) --always-make fast_generate
67-
git checkout -- vendor/modules.txt go.mod go.sum # can differ between go1.12 and go1.13
65+
git checkout -- go.mod go.sum # can differ between go1.12 and go1.13
6866
git diff --exit-code # check no changes
6967
.PHONY: fast_check_generated
7068

@@ -105,11 +103,3 @@ go.mod: FORCE
105103
go mod tidy
106104
go mod verify
107105
go.sum: go.mod
108-
109-
vendor: go.mod go.sum
110-
go mod vendor
111-
112-
unexport GOFLAGS
113-
vendor_free_build: FORCE
114-
go build -o golangci-lint ./cmd/golangci-lint
115-
.PHONY: vendor_free_build vendor

vendor/github.com/BurntSushi/toml/.gitignore

-5
This file was deleted.

vendor/github.com/BurntSushi/toml/.travis.yml

-15
This file was deleted.

vendor/github.com/BurntSushi/toml/COMPATIBLE

-3
This file was deleted.

vendor/github.com/BurntSushi/toml/COPYING

-21
This file was deleted.

vendor/github.com/BurntSushi/toml/Makefile

-19
This file was deleted.

vendor/github.com/BurntSushi/toml/README.md

-218
This file was deleted.

0 commit comments

Comments
 (0)