@@ -28,7 +28,7 @@ XGO_VERSION := go-1.24.x
2828AIR_PACKAGE ?= github.com/air-verse/air@v1
2929EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v3/cmd/
[email protected] 3030GOFUMPT_PACKAGE ?= mvdan.cc/
[email protected] 31- GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.63.4
31+ GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.5
3232GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/
[email protected] 3333MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/
[email protected] 3434SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/
[email protected] @@ -146,7 +146,7 @@ WEB_DIRS := web_src/js web_src/css
146146
147147ESLINT_FILES := web_src/js tools *.js *.ts *.cjs tests/e2e
148148STYLELINT_FILES := web_src/css web_src/js/components/*.vue
149- SPELLCHECK_FILES := $(GO_DIRS ) $(WEB_DIRS ) templates options/locale/locale_en-US.ini .github $(filter-out CHANGELOG.md, $(wildcard * .go * .js * .md * .yml * .yaml * .toml) )
149+ SPELLCHECK_FILES := $(GO_DIRS ) $(WEB_DIRS ) templates options/locale/locale_en-US.ini .github $(filter-out CHANGELOG.md, $(wildcard * .go * .js * .md * .yml * .yaml * .toml) ) $( filter-out tools/misspellings.csv, $( wildcard tools/ * ) )
150150EDITORCONFIG_FILES := templates .github/workflows options/locale/locale_en-US.ini
151151
152152GO_SOURCES := $(wildcard * .go)
@@ -165,10 +165,8 @@ ifdef DEPS_PLAYWRIGHT
165165endif
166166
167167SWAGGER_SPEC := templates/swagger/v1_json.tmpl
168- SWAGGER_SPEC_S_TMPL := s|"basePath": *"/api/v1"|"basePath": "{{AppSubUrl \| JSEscape}}/api/v1"|g
169- SWAGGER_SPEC_S_JSON := s|"basePath": *"{{AppSubUrl \| JSEscape}}/api/v1"|"basePath": "/api/v1"|g
168+ SWAGGER_SPEC_INPUT := templates/swagger/v1_input.json
170169SWAGGER_EXCLUDE := code.gitea.io/sdk
171- SWAGGER_NEWLINE_COMMAND := -e '$$a\'
172170
173171TEST_MYSQL_HOST ?= mysql:3306
174172TEST_MYSQL_DBNAME ?= testgitea
@@ -255,7 +253,7 @@ fmt-check: fmt
255253 @diff=$$(git diff --color=always $(GO_SOURCES ) templates $(WEB_DIRS ) ) ; \
256254 if [ -n " $$ diff" ; then \
257255 echo " Please run 'make fmt' and commit the result:" ; \
258- echo " $$ {diff}" ; \
256+ printf " %s " " $$ {diff}" ; \
259257 exit 1; \
260258 fi
261259
@@ -271,25 +269,25 @@ endif
271269.PHONY : generate-swagger
272270generate-swagger : $(SWAGGER_SPEC ) # # generate the swagger spec from code comments
273271
274- $(SWAGGER_SPEC ) $(GO_SOURCES_NO_BINDATA )
275- $(GO ) run $(SWAGGER_PACKAGE ) generate spec -x " $( SWAGGER_EXCLUDE) " ' ./$(SWAGGER_SPEC)'
276- $(SED_INPLACE ) ' $(SWAGGER_SPEC_S_TMPL)' ' ./$(SWAGGER_SPEC)'
277- $(SED_INPLACE ) $(SWAGGER_NEWLINE_COMMAND ) ' ./$(SWAGGER_SPEC)'
272+ $(SWAGGER_SPEC ) $(GO_SOURCES_NO_BINDATA ) $(SWAGGER_SPEC_INPUT )
273+ $(GO ) run $(SWAGGER_PACKAGE ) generate spec --exclude " $( SWAGGER_EXCLUDE) " " $( SWAGGER_SPEC_INPUT) " ' ./$(SWAGGER_SPEC)'
278274
279275.PHONY : swagger-check
280276swagger-check : generate-swagger
281277 @diff=$$(git diff --color=always '$(SWAGGER_SPEC ) ' ) ; \
282278 if [ -n " $$ diff" ; then \
283279 echo " Please run 'make generate-swagger' and commit the result:" ; \
284- echo " $$ {diff}" ; \
280+ printf " %s " " $$ {diff}" ; \
285281 exit 1; \
286282 fi
287283
288284.PHONY : swagger-validate
289285swagger-validate : # # check if the swagger spec is valid
290- $(SED_INPLACE ) ' $(SWAGGER_SPEC_S_JSON)' ' ./$(SWAGGER_SPEC)'
286+ @# swagger "validate" requires that the "basePath" must start with a slash, but we are using Golang template "{{...}}"
287+ @$(SED_INPLACE ) -E -e ' s|"basePath":( *)"(.*)"|"basePath":\1"/\2"|g' ' ./$(SWAGGER_SPEC)' # add a prefix slash to basePath
288+ @# FIXME: there are some warnings
291289 $(GO ) run $(SWAGGER_PACKAGE ) validate ' ./$(SWAGGER_SPEC)'
292- $(SED_INPLACE ) ' $(SWAGGER_SPEC_S_TMPL) ' ' ./$(SWAGGER_SPEC)'
290+ @ $(SED_INPLACE ) -E -e ' s|"basePath":( *)"/(.*)"|"basePath":\1"\2"|g ' ' ./$(SWAGGER_SPEC)' # remove the prefix slash from basePath
293291
294292.PHONY : checks
295293checks : checks-frontend checks-backend # # run various consistency checks
@@ -380,6 +378,7 @@ lint-go-gopls: ## lint go files with gopls
380378
381379.PHONY : lint-editorconfig
382380lint-editorconfig :
381+ @echo " Running editorconfig check..."
383382 @$(GO ) run $(EDITORCONFIG_CHECKER_PACKAGE ) $(EDITORCONFIG_FILES )
384383
385384.PHONY : lint-actions
@@ -426,7 +425,7 @@ test-check:
426425 @diff=$$(git status -s ) ; \
427426 if [ -n " $$ diff" ; then \
428427 echo " make test-backend has changed files in the source tree:" ; \
429- echo " $$ {diff}" ; \
428+ printf " %s " " $$ {diff}" ; \
430429 echo " You should change the tests to create these files in a temporary directory." ; \
431430 echo " Do not simply add these files to .gitignore" ; \
432431 exit 1; \
@@ -463,7 +462,7 @@ tidy-check: tidy
463462 @diff=$$(git diff --color=always go.mod go.sum $(GO_LICENSE_FILE ) ) ; \
464463 if [ -n " $$ diff" ; then \
465464 echo " Please run 'make tidy' and commit the result:" ; \
466- echo " $$ {diff}" ; \
465+ printf " %s " " $$ {diff}" ; \
467466 exit 1; \
468467 fi
469468
@@ -879,7 +878,7 @@ svg-check: svg
879878 @diff=$$(git diff --color=always --cached $(SVG_DEST_DIR ) ) ; \
880879 if [ -n " $$ diff" ; then \
881880 echo " Please run 'make svg' and 'git add $( SVG_DEST_DIR) " ; \
882- echo " $$ {diff}" ; \
881+ printf " %s " " $$ {diff}" ; \
883882 exit 1; \
884883 fi
885884
@@ -890,7 +889,7 @@ lockfile-check:
890889 if [ -n " $$ diff" ; then \
891890 echo " package-lock.json is inconsistent with package.json" ; \
892891 echo " Please run 'npm install --package-lock-only' and commit the result:" ; \
893- echo " $$ {diff}" ; \
892+ printf " %s " " $$ {diff}" ; \
894893 exit 1; \
895894 fi
896895
0 commit comments