Merge branch 'main' of https://gitea.com/gitea/tea into gitea-main

Signed-off-by: Martin Veldwijk <riven@tae.moe>
This commit is contained in:
Martin Veldwijk 2023-08-21 09:04:22 +02:00
commit bba2b280aa
No known key found for this signature in database
GPG key ID: 869F2A63E8F5FDA7
3 changed files with 6 additions and 4 deletions

View file

@ -8,7 +8,7 @@ labels:
### describe your environment
- tea version used (`tea -v`):
- [ ] I also reproduced the issue [with the latest master build](https://dl.gitea.io/tea/master)
- [ ] I also reproduced the issue [with the latest master build](https://dl.gitea.com/tea/main/)
- Gitea version used:
- [ ] the issue only occurred after updating gitea recently
- operating system:

2
.gitignore vendored
View file

@ -1,5 +1,5 @@
tea
/gitea-vet
/gitea-vet[.exe]
.idea/
.history/

View file

@ -36,8 +36,10 @@ SOURCES ?= $(shell find . -name "*.go" -type f)
# OS specific vars.
ifeq ($(OS), Windows_NT)
EXECUTABLE := tea.exe
VET_TOOL := gitea-vet.exe
else
EXECUTABLE := tea
VET_TOOL := gitea-vet
ifneq ($(shell uname -s), OpenBSD)
override BUILDMODE := -buildmode=pie
endif
@ -61,7 +63,7 @@ vet:
$(GO) vet $(PACKAGES)
# Custom vet
$(GO) build code.gitea.io/gitea-vet
$(GO) vet -vettool=gitea-vet $(PACKAGES)
$(GO) vet -vettool=$(VET_TOOL) $(PACKAGES)
.PHONY: lint
lint: install-lint-tools
@ -120,7 +122,7 @@ release: release-dirs install-release-tools release-os release-compress release-
.PHONY: release-dirs
release-dirs:
mkdir -p $(DIST)/binaries $(DIST)/release
mkdir -p $(DIST)/release
.PHONY: release-os
release-os: