From 3db3f5daaeea38a9a8d8ec1a05d864e288338f82 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 21 Aug 2023 00:59:19 +0200 Subject: [PATCH] Update tool dependencies (#26607) - Updated all tool dependencies to latest versions - Add Makefile to `swagger` files because it specifies `go-swagger` version - Fix lint --- .github/workflows/files-changed.yml | 1 + Makefile | 4 ++-- modules/web/routing/logger_manager.go | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/files-changed.yml b/.github/workflows/files-changed.yml index 0c382567cca7a..f9156d668d5cb 100644 --- a/.github/workflows/files-changed.yml +++ b/.github/workflows/files-changed.yml @@ -71,3 +71,4 @@ jobs: swagger: - "templates/swagger/v1_json.tmpl" + - "Makefile" diff --git a/Makefile b/Makefile index 1100b9a621516..908ee7a3374da 100644 --- a/Makefile +++ b/Makefile @@ -28,13 +28,13 @@ XGO_VERSION := go-1.21.x AIR_PACKAGE ?= github.com/cosmtrek/air@v1.44.0 EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/cmd/editorconfig-checker@2.7.0 GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.5.0 -GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.53.3 +GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54.1 GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.11 MISSPELL_PACKAGE ?= github.com/client9/misspell/cmd/misspell@v0.3.4 SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.30.5 XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest GO_LICENSES_PACKAGE ?= github.com/google/go-licenses@v1.6.0 -GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1.0.0 +GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1.0.1 ACTIONLINT_PACKAGE ?= github.com/rhysd/actionlint/cmd/actionlint@v1.6.25 DOCKER_IMAGE ?= gitea/gitea diff --git a/modules/web/routing/logger_manager.go b/modules/web/routing/logger_manager.go index acd8c4b7dc994..aa25ec3a27160 100644 --- a/modules/web/routing/logger_manager.go +++ b/modules/web/routing/logger_manager.go @@ -31,7 +31,7 @@ const ( type Printer func(trigger Event, record *requestRecord) type requestRecordsManager struct { - print Printer //nolint:forbidigo + print Printer lock sync.Mutex