Merge branch 'master' into patch-2-merge-strategy-temp

Author: everhopingandwaiting

Makefile

@@ -301,7 +301,7 @@ unit-test-coverage:
 
 .PHONY: vendor
 vendor:
-	$(GO) mod tidy && $(GO) mod vendor
+	$(GO) mod tidy && TAGS="$(TAGS) vendor" $(GO) mod vendor
 
 .PHONY: test-vendor
 test-vendor: vendor

build/vendor.go renamed to build.go

@@ -2,7 +2,12 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package build
+//+build vendor
+
+package main
+
+// Libraries that are included to vendor utilities used during build.
+// These libraries will not be included in a normal compilation.
 
 import (
 	// for lint

main.go

@@ -21,9 +21,6 @@ import (
 	_ "code.gitea.io/gitea/modules/markup/markdown"
 	_ "code.gitea.io/gitea/modules/markup/orgmode"
 
-	// for build
-	_ "code.gitea.io/gitea/build"
-
 	"github.com/urfave/cli"
 )