Skip to content

Commit 5901bd7

Browse files
authored
Merge branch 'main' into feature/runner-logs-api-endpoint
2 parents a18a42b + e03a68c commit 5901bd7

File tree

12 files changed

+878
-1349
lines changed

12 files changed

+878
-1349
lines changed

.golangci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ linters:
153153
text: '(?i)exitAfterDefer:'
154154
paths:
155155
- node_modules
156+
- .venv
156157
- public
157158
- web_src
158159
- third_party$
@@ -172,6 +173,7 @@ formatters:
172173
generated: lax
173174
paths:
174175
- node_modules
176+
- .venv
175177
- public
176178
- web_src
177179
- third_party$

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ XGO_VERSION := go-1.25.x
3131

3232
AIR_PACKAGE ?= github.com/air-verse/air@v1
3333
EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker@v3
34-
GOFUMPT_PACKAGE ?= mvdan.cc/[email protected].1
35-
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.4.0
34+
GOFUMPT_PACKAGE ?= mvdan.cc/[email protected].2
35+
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.5.0
3636
GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/[email protected]
3737
MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/[email protected]
38-
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@717e3cb29becaaf00e56953556c6d80f8a01b286
38+
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.33.1
3939
XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest
4040
GO_LICENSES_PACKAGE ?= github.com/google/go-licenses@v1
4141
GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1
@@ -258,7 +258,7 @@ clean: ## delete backend and integration files
258258

259259
.PHONY: fmt
260260
fmt: ## format the Go and template code
261-
@GOFUMPT_PACKAGE=$(GOFUMPT_PACKAGE) $(GO) run build/code-batch-process.go gitea-fmt -w '{file-list}'
261+
@GOFUMPT_PACKAGE=$(GOFUMPT_PACKAGE) $(GO) run tools/code-batch-process.go gitea-fmt -w '{file-list}'
262262
$(eval TEMPLATES := $(shell find templates -type f -name '*.tmpl'))
263263
@# strip whitespace after '{{' or '(' and before '}}' or ')' unless there is only
264264
@# whitespace before it
@@ -472,7 +472,7 @@ test\#%:
472472
coverage:
473473
grep '^\(mode: .*\)\|\(.*:[0-9]\+\.[0-9]\+,[0-9]\+\.[0-9]\+ [0-9]\+ [0-9]\+\)$$' coverage.out > coverage-bodged.out
474474
grep '^\(mode: .*\)\|\(.*:[0-9]\+\.[0-9]\+,[0-9]\+\.[0-9]\+ [0-9]\+ [0-9]\+\)$$' integration.coverage.out > integration.coverage-bodged.out
475-
$(GO) run build/gocovmerge.go integration.coverage-bodged.out coverage-bodged.out > coverage.all
475+
$(GO) run tools/gocovmerge.go integration.coverage-bodged.out coverage-bodged.out > coverage.all
476476

477477
.PHONY: unit-test-coverage
478478
unit-test-coverage:

build/code-batch-process.go

Lines changed: 0 additions & 281 deletions
This file was deleted.

0 commit comments

Comments
 (0)