Skip to content

Commit 2c8a1a2

Browse files
committed
Move go-licenses to generate
The go-licenses check introduced in go-gitea#21034 is being run on make vendor and occassionally causes an empty go-licenses file if the vendors need to change. This should be moved to the generate task as it is a generated file. Ref go-gitea#21034 Signed-off-by: Andrew Thornton <[email protected]>
1 parent 8b0aaa5 commit 2c8a1a2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ clean:
259259
fmt:
260260
@MISSPELL_PACKAGE=$(MISSPELL_PACKAGE) GOFUMPT_PACKAGE=$(GOFUMPT_PACKAGE) $(GO) run build/code-batch-process.go gitea-fmt -w '{file-list}'
261261
$(eval TEMPLATES := $(shell find templates -type f -name '*.tmpl'))
262-
@# strip whitespace after '{{' and before `}}` unless there is only whitespace before it
262+
@# strip whitespace after '{{' and before `}}` unless there is only whitespace before it
263263
@$(SED_INPLACE) -e 's/{{[ ]\{1,\}/{{/g' -e '/^[ ]\{1,\}}}/! s/[ ]\{1,\}}}/}}/g' $(TEMPLATES)
264264

265265
.PHONY: vet
@@ -398,7 +398,6 @@ unit-test-coverage:
398398
tidy:
399399
$(eval MIN_GO_VERSION := $(shell grep -Eo '^go\s+[0-9]+\.[0-9.]+' go.mod | cut -d' ' -f2))
400400
$(GO) mod tidy -compat=$(MIN_GO_VERSION)
401-
@$(MAKE) --no-print-directory assets/go-licenses.json
402401

403402
.PHONY: vendor
404403
vendor: tidy
@@ -709,6 +708,7 @@ backend: go-check generate $(EXECUTABLE)
709708

710709
.PHONY: generate
711710
generate: $(TAGS_PREREQ)
711+
@$(MAKE) --no-print-directory assets/go-licenses.json
712712
@echo "Running go generate..."
713713
@CC= GOOS= GOARCH= $(GO) generate -tags '$(TAGS)' $(GO_PACKAGES)
714714

0 commit comments

Comments
 (0)