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

Move go-licenses to generate and separate generate into a frontend and backend component #21061

Merged
merged 11 commits into from
Sep 5, 2022
Merged

Move go-licenses to generate and separate generate into a frontend and backend component #21061

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2c8a1a2
Move go-licenses to generate
zeripath Sep 4, 2022
e7396ae
Only update the generated files if necessary
zeripath Sep 4, 2022
2aab729
Separate out generate into a frontend and backend
zeripath Sep 4, 2022
055e3d2
commit the results of running fmt
zeripath Sep 4, 2022
fe0218e
OK we cannot have the swagger be in the frontend generation so move i…
zeripath Sep 4, 2022
2905adf
do not rely on bindata for generate-swagger
zeripath Sep 4, 2022
b824367
Update modules/charset/invisible/generate.go
zeripath Sep 4, 2022
be6bc12
Update modules/charset/ambiguous/generate.go
zeripath Sep 4, 2022
357cce5
Apply suggestions from code review
zeripath Sep 4, 2022
035e698
Update Makefile
zeripath Sep 5, 2022
61fa803
Merge branch 'main' into move-gen-licenses-to-generate
zeripath Sep 5, 2022
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
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ clean:
fmt:
@MISSPELL_PACKAGE=$(MISSPELL_PACKAGE) GOFUMPT_PACKAGE=$(GOFUMPT_PACKAGE) $(GO) run build/code-batch-process.go gitea-fmt -w '{file-list}'
$(eval TEMPLATES := $(shell find templates -type f -name '*.tmpl'))
@# strip whitespace after '{{' and before `}}` unless there is only whitespace before it
@# strip whitespace after '{{' and before `}}` unless there is only whitespace before it
@$(SED_INPLACE) -e 's/{{[ ]\{1,\}/{{/g' -e '/^[ ]\{1,\}}}/! s/[ ]\{1,\}}}/}}/g' $(TEMPLATES)

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

.PHONY: vendor
vendor: tidy
Expand Down Expand Up @@ -709,6 +708,7 @@ backend: go-check generate $(EXECUTABLE)

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

Expand Down