Skip to content

Commit 6b8a340

Browse files
committed
make GO111MODULE=on default on makefile
1 parent 5e27f4e commit 6b8a340

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

Makefile

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
DIST := dist
22
IMPORT := code.gitea.io/gitea
3-
export GO111MODULE=off
3+
export GO111MODULE=on
44

55
GO ?= go
66
SED_INPLACE := sed -i
@@ -97,12 +97,12 @@ vet:
9797

9898
.PHONY: generate
9999
generate:
100-
GO111MODULE=on $(GO) generate -mod=vendor $(PACKAGES)
100+
$(GO) generate -mod=vendor $(PACKAGES)
101101

102102
.PHONY: generate-swagger
103103
generate-swagger:
104104
@hash swagger > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
105-
GO111MODULE="on" $(GO) get -u github.com/go-swagger/go-swagger/cmd/[email protected]; \
105+
$(GO) get -u github.com/go-swagger/go-swagger/cmd/[email protected]; \
106106
fi
107107
swagger generate spec -o './$(SWAGGER_SPEC)'
108108
$(SED_INPLACE) '$(SWAGGER_SPEC_S_TMPL)' './$(SWAGGER_SPEC)'
@@ -170,7 +170,7 @@ fmt-check:
170170

171171
.PHONY: test
172172
test:
173-
GO111MODULE=on $(GO) test -mod=vendor -tags='sqlite sqlite_unlock_notify' $(PACKAGES)
173+
$(GO) test -mod=vendor -tags='sqlite sqlite_unlock_notify' $(PACKAGES)
174174

175175
.PHONY: coverage
176176
coverage:
@@ -185,7 +185,7 @@ unit-test-coverage:
185185

186186
.PHONY: vendor
187187
vendor:
188-
GO111MODULE=on $(GO) mod tidy && GO111MODULE=on $(GO) mod vendor
188+
$(GO) mod tidy && $(GO) mod vendor
189189

190190
.PHONY: test-vendor
191191
test-vendor: vendor
@@ -285,34 +285,34 @@ integration-test-coverage: integrations.cover.test generate-ini
285285
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.cover.test -test.coverprofile=integration.coverage.out
286286

287287
integrations.test: $(SOURCES)
288-
GO111MODULE=on $(GO) test -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.test
288+
$(GO) test -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.test
289289

290290
integrations.sqlite.test: $(SOURCES)
291-
GO111MODULE=on $(GO) test -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.sqlite.test -tags 'sqlite sqlite_unlock_notify'
291+
$(GO) test -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.sqlite.test -tags 'sqlite sqlite_unlock_notify'
292292

293293
integrations.cover.test: $(SOURCES)
294-
GO111MODULE=on $(GO) test -mod=vendor -c code.gitea.io/gitea/integrations -coverpkg $(shell echo $(PACKAGES) | tr ' ' ',') -o integrations.cover.test
294+
$(GO) test -mod=vendor -c code.gitea.io/gitea/integrations -coverpkg $(shell echo $(PACKAGES) | tr ' ' ',') -o integrations.cover.test
295295

296296
.PHONY: migrations.test
297297
migrations.test: $(SOURCES)
298-
$(GO) test -c code.gitea.io/gitea/integrations/migration-test -o migrations.test
298+
$(GO) test -mod=vendor -c code.gitea.io/gitea/integrations/migration-test -o migrations.test
299299

300300
.PHONY: migrations.sqlite.test
301301
migrations.sqlite.test: $(SOURCES)
302-
$(GO) test -c code.gitea.io/gitea/integrations/migration-test -o migrations.sqlite.test -tags 'sqlite sqlite_unlock_notify'
302+
$(GO) test -mod=vendor -c code.gitea.io/gitea/integrations/migration-test -o migrations.sqlite.test -tags 'sqlite sqlite_unlock_notify'
303303

304304
.PHONY: check
305305
check: test
306306

307307
.PHONY: install
308308
install: $(wildcard *.go)
309-
$(GO) install -v -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)'
309+
$(GO) install -mod=vendor -v -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)'
310310

311311
.PHONY: build
312312
build: $(EXECUTABLE)
313313

314314
$(EXECUTABLE): $(SOURCES)
315-
GO111MODULE=on $(GO) build -mod=vendor $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@
315+
$(GO) build -mod=vendor $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@
316316

317317
.PHONY: release
318318
release: release-dirs release-windows release-linux release-darwin release-copy release-compress release-check

0 commit comments

Comments
 (0)