From b74d30ae275b4f025f689efca748dd0cbd826b22 Mon Sep 17 00:00:00 2001 From: guillep2k <18600385+guillep2k@users.noreply.github.com> Date: Sun, 5 Apr 2020 00:35:02 -0300 Subject: [PATCH] Prevent support libraries from compiling into Gitea (#10964) * Prevent support libraries from compiling into Gitea * Fix tag position * Fix golangci-lint errors * Refactor to make it work Co-authored-by: Guillermo Prandi --- Makefile | 2 +- build/vendor.go => build.go | 7 ++++++- main.go | 3 --- 3 files changed, 7 insertions(+), 5 deletions(-) rename build/vendor.go => build.go (74%) diff --git a/Makefile b/Makefile index 9663e8b6d..7af41ab74 100644 --- a/Makefile +++ b/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 diff --git a/build/vendor.go b/build.go similarity index 74% rename from build/vendor.go rename to build.go index d51fbf21f..22c6ded99 100644 --- a/build/vendor.go +++ b/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 diff --git a/main.go b/main.go index ecf161bf1..90feaa9bb 100644 --- a/main.go +++ b/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" )