Skip to content

Commit 345fae6

Browse files
rm go vendor
1 parent 2b16ca7 commit 345fae6

File tree

6,585 files changed

+24
-2584478
lines changed

Some content is hidden

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

6,585 files changed

+24
-2584478
lines changed

.drone.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ steps:
9090
GO111MODULE: on
9191
GOPROXY: off
9292
commands:
93-
- go build -mod=vendor -o gitea_no_gcc # test if build succeeds without the sqlite tag
93+
- go build o gitea_no_gcc # test if build succeeds without the sqlite tag
9494
depends_on: [checks-backend]
9595

9696
- name: build-backend-arm64
@@ -115,7 +115,7 @@ steps:
115115
GOARCH: amd64
116116
TAGS: bindata gogit
117117
commands:
118-
- go build -mod=vendor -o gitea_windows
118+
- go build -o gitea_windows
119119
depends_on: [checks-backend]
120120

121121
- name: build-backend-386
@@ -126,7 +126,7 @@ steps:
126126
GOOS: linux
127127
GOARCH: 386
128128
commands:
129-
- go build -mod=vendor -o gitea_linux_386 # test if compatible with 32 bit
129+
- go build -o gitea_linux_386 # test if compatible with 32 bit
130130
depends_on: [checks-backend]
131131

132132
---

Makefile

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(G
9292

9393
LINUX_ARCHS ?= linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64
9494

95-
GO_PACKAGES ?= $(filter-out code.gitea.io/gitea/models/migrations code.gitea.io/gitea/integrations/migration-test code.gitea.io/gitea/integrations,$(shell $(GO) list -mod=vendor ./... | grep -v /vendor/))
95+
GO_PACKAGES ?= $(filter-out code.gitea.io/gitea/models/migrations code.gitea.io/gitea/integrations/migration-test code.gitea.io/gitea/integrations,$(shell $(GO) list ./... | grep -v /vendor/))
9696

9797
FOMANTIC_WORK_DIR := web_src/fomantic
9898

@@ -116,7 +116,7 @@ TEST_TAGS ?= sqlite sqlite_unlock_notify
116116

117117
TAR_EXCLUDES := .git data indexers queues log node_modules $(EXECUTABLE) $(FOMANTIC_WORK_DIR)/node_modules $(DIST) $(MAKE_EVIDENCE_DIR) $(AIR_TMP_DIR)
118118

119-
GO_DIRS := cmd integrations models modules routers build services vendor tools
119+
GO_DIRS := cmd integrations models modules routers build services tools
120120

121121
GO_SOURCES := $(wildcard *.go)
122122
GO_SOURCES += $(shell find $(GO_DIRS) -type f -name "*.go" -not -path modules/options/bindata.go -not -path modules/public/bindata.go -not -path modules/templates/bindata.go)
@@ -126,7 +126,7 @@ ifeq ($(filter $(TAGS_SPLIT),bindata),bindata)
126126
endif
127127

128128
#To update swagger use: GO111MODULE=on go get -u github.com/go-swagger/go-swagger/cmd/swagger
129-
SWAGGER := $(GO) run -mod=vendor github.com/go-swagger/go-swagger/cmd/swagger
129+
SWAGGER := $(GO) run github.com/go-swagger/go-swagger/cmd/swagger
130130
SWAGGER_SPEC := templates/swagger/v1_json.tmpl
131131
SWAGGER_SPEC_S_TMPL := s|"basePath": *"/api/v1"|"basePath": "{{AppSubUrl \| JSEscape \| Safe}}/api/v1"|g
132132
SWAGGER_SPEC_S_JSON := s|"basePath": *"{{AppSubUrl \| JSEscape \| Safe}}/api/v1"|"basePath": "/api/v1"|g
@@ -237,7 +237,7 @@ fmt:
237237
.PHONY: vet
238238
vet:
239239
@echo "Running go vet..."
240-
@GOOS= GOARCH= $(GO) build -mod=vendor code.gitea.io/gitea-vet
240+
@GOOS= GOARCH= $(GO) build code.gitea.io/gitea-vet
241241
@$(GO) vet -vettool=gitea-vet $(GO_PACKAGES)
242242

243243
.PHONY: $(TAGS_EVIDENCE)
@@ -295,7 +295,7 @@ checks: checks-frontend checks-backend
295295
checks-frontend: svg-check
296296

297297
.PHONY: checks-backend
298-
checks-backend: test-vendor swagger-check swagger-validate
298+
checks-backend: swagger-check swagger-validate
299299

300300
.PHONY: lint
301301
lint: lint-frontend lint-backend
@@ -331,7 +331,7 @@ test: test-frontend test-backend
331331
.PHONY: test-backend
332332
test-backend:
333333
@echo "Running go test with $(GOTESTFLAGS) -tags '$(TEST_TAGS)'..."
334-
@$(GO) test $(GOTESTFLAGS) -mod=vendor -tags='$(TEST_TAGS)' $(GO_PACKAGES)
334+
@$(GO) test $(GOTESTFLAGS) -tags='$(TEST_TAGS)' $(GO_PACKAGES)
335335

336336
.PHONY: test-frontend
337337
test-frontend: node_modules
@@ -352,18 +352,18 @@ test-check:
352352
.PHONY: test\#%
353353
test\#%:
354354
@echo "Running go test with -tags '$(TEST_TAGS)'..."
355-
@$(GO) test -mod=vendor $(GOTESTFLAGS) -tags='$(TEST_TAGS)' -run $(subst .,/,$*) $(GO_PACKAGES)
355+
@$(GO) test $(GOTESTFLAGS) -tags='$(TEST_TAGS)' -run $(subst .,/,$*) $(GO_PACKAGES)
356356

357357
.PHONY: coverage
358358
coverage:
359359
grep '^\(mode: .*\)\|\(.*:[0-9]\+\.[0-9]\+,[0-9]\+\.[0-9]\+ [0-9]\+ [0-9]\+\)$$' coverage.out > coverage-bodged.out
360360
grep '^\(mode: .*\)\|\(.*:[0-9]\+\.[0-9]\+,[0-9]\+\.[0-9]\+ [0-9]\+ [0-9]\+\)$$' integration.coverage.out > integration.coverage-bodged.out
361-
GO111MODULE=on $(GO) run -mod=vendor build/gocovmerge.go integration.coverage-bodged.out coverage-bodged.out > coverage.all || (echo "gocovmerge failed"; echo "integration.coverage.out"; cat integration.coverage.out; echo "coverage.out"; cat coverage.out; exit 1)
361+
GO111MODULE=on $(GO) run build/gocovmerge.go integration.coverage-bodged.out coverage-bodged.out > coverage.all || (echo "gocovmerge failed"; echo "integration.coverage.out"; cat integration.coverage.out; echo "coverage.out"; cat coverage.out; exit 1)
362362

363363
.PHONY: unit-test-coverage
364364
unit-test-coverage:
365365
@echo "Running unit-test-coverage $(GOTESTFLAGS) -tags '$(TEST_TAGS)'..."
366-
@$(GO) test $(GOTESTFLAGS) -mod=vendor -timeout=20m -tags='$(TEST_TAGS)' -cover -coverprofile coverage.out $(GO_PACKAGES) && echo "\n==>\033[32m Ok\033[m\n" || exit 1
366+
@$(GO) test $(GOTESTFLAGS) -timeout=20m -tags='$(TEST_TAGS)' -cover -coverprofile coverage.out $(GO_PACKAGES) && echo "\n==>\033[32m Ok\033[m\n" || exit 1
367367

368368
.PHONY: vendor
369369
vendor:
@@ -501,22 +501,22 @@ integration-test-coverage: integrations.cover.test generate-ini-mysql
501501
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql.ini ./integrations.cover.test -test.coverprofile=integration.coverage.out
502502

503503
integrations.mysql.test: git-check $(GO_SOURCES)
504-
$(GO) test $(GOTESTFLAGS) -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.mysql.test
504+
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/integrations -o integrations.mysql.test
505505

506506
integrations.mysql8.test: git-check $(GO_SOURCES)
507-
$(GO) test $(GOTESTFLAGS) -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.mysql8.test
507+
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/integrations -o integrations.mysql8.test
508508

509509
integrations.pgsql.test: git-check $(GO_SOURCES)
510-
$(GO) test $(GOTESTFLAGS) -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.pgsql.test
510+
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/integrations -o integrations.pgsql.test
511511

512512
integrations.mssql.test: git-check $(GO_SOURCES)
513-
$(GO) test $(GOTESTFLAGS) -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.mssql.test
513+
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/integrations -o integrations.mssql.test
514514

515515
integrations.sqlite.test: git-check $(GO_SOURCES)
516-
$(GO) test $(GOTESTFLAGS) -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.sqlite.test -tags '$(TEST_TAGS)'
516+
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/integrations -o integrations.sqlite.test -tags '$(TEST_TAGS)'
517517

518518
integrations.cover.test: git-check $(GO_SOURCES)
519-
$(GO) test $(GOTESTFLAGS) -mod=vendor -c code.gitea.io/gitea/integrations -coverpkg $(shell echo $(GO_PACKAGES) | tr ' ' ',') -o integrations.cover.test
519+
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/integrations -coverpkg $(shell echo $(GO_PACKAGES) | tr ' ' ',') -o integrations.cover.test
520520

521521
.PHONY: migrations.mysql.test
522522
migrations.mysql.test: $(GO_SOURCES)
@@ -577,13 +577,13 @@ backend: go-check generate $(EXECUTABLE)
577577
.PHONY: generate
578578
generate: $(TAGS_PREREQ)
579579
@echo "Running go generate..."
580-
@CC= GOOS= GOARCH= $(GO) generate -mod=vendor -tags '$(TAGS)' $(GO_PACKAGES)
580+
@CC= GOOS= GOARCH= $(GO) generate -tags '$(TAGS)' $(GO_PACKAGES)
581581

582582
$(EXECUTABLE): $(GO_SOURCES) $(TAGS_PREREQ)
583-
CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build -mod=vendor $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@
583+
CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@
584584

585585
.PHONY: release
586-
release: frontend generate release-windows release-linux release-darwin release-copy release-compress release-sources release-docs release-check
586+
release: frontend generate release-windows release-linux release-darwin release-copy release-compress vendor release-sources release-docs release-check
587587

588588
$(DIST_DIRS):
589589
mkdir -p $(DIST_DIRS)

modules/options/options_bindata.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77

88
package options
99

10-
//go:generate go run -mod=vendor ../../build/generate-bindata.go ../../options options bindata.go
10+
//go:generate go run ../../build/generate-bindata.go ../../options options bindata.go

modules/public/public_bindata.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77

88
package public
99

10-
//go:generate go run -mod=vendor ../../build/generate-bindata.go ../../public public bindata.go true
10+
//go:generate go run ../../build/generate-bindata.go ../../public public bindata.go true

modules/templates/templates_bindata.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77

88
package templates
99

10-
//go:generate go run -mod=vendor ../../build/generate-bindata.go ../../templates templates bindata.go true
10+
//go:generate go run ../../build/generate-bindata.go ../../templates templates bindata.go true

vendor/cloud.google.com/go/LICENSE

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

0 commit comments

Comments
 (0)