Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prevent support libraries from compiling into Gitea #10964

Merged
merged 4 commits into from
Apr 5, 2020
Merged

Prevent support libraries from compiling into Gitea #10964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e326d3
Prevent support libraries from compiling into Gitea
guillep2k Apr 4, 2020
f3195c4
Fix tag position
guillep2k Apr 4, 2020
94f74f8
Fix golangci-lint errors
guillep2k Apr 4, 2020
8425556
Refactor to make it work
guillep2k Apr 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion build/vendor.go → build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down