From a6cea595146d0de42aa83c9cca929b015aae4552 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 3 Feb 2024 01:11:39 +0100 Subject: [PATCH] Update tool dependencies (#29030) --- Makefile | 10 +++++----- models/asymkey/gpg_key_verify.go | 1 - modules/lfs/http_client.go | 1 - modules/markup/markdown/goldmark.go | 1 - routers/api/v1/repo/commits.go | 2 -- routers/web/feed/convert.go | 1 - services/repository/check.go | 1 - 7 files changed, 5 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 068dda5f52..273ae1fa68 100644 --- a/Makefile +++ b/Makefile @@ -25,17 +25,17 @@ COMMA := , XGO_VERSION := go-1.21.x -AIR_PACKAGE ?= github.com/cosmtrek/air@v1.44.0 +AIR_PACKAGE ?= github.com/cosmtrek/air@v1.49.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.55.0 +GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.6.0 +GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.2 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.1 -ACTIONLINT_PACKAGE ?= github.com/rhysd/actionlint/cmd/actionlint@v1.6.25 +GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1.0.3 +ACTIONLINT_PACKAGE ?= github.com/rhysd/actionlint/cmd/actionlint@v1.6.26 DOCKER_IMAGE ?= gitea/gitea DOCKER_TAG ?= latest diff --git a/models/asymkey/gpg_key_verify.go b/models/asymkey/gpg_key_verify.go index 98a3e7d390..4cf46ab556 100644 --- a/models/asymkey/gpg_key_verify.go +++ b/models/asymkey/gpg_key_verify.go @@ -63,7 +63,6 @@ func VerifyGPGKey(ctx context.Context, ownerID int64, keyID, token, signature st } if signer == nil { signer, err = hashAndVerifyWithSubKeys(sig, token+"\n", key) - if err != nil { return "", ErrGPGInvalidTokenSignature{ ID: key.KeyID, diff --git a/modules/lfs/http_client.go b/modules/lfs/http_client.go index de0b1e4fed..e06879baea 100644 --- a/modules/lfs/http_client.go +++ b/modules/lfs/http_client.go @@ -168,7 +168,6 @@ func (c *HTTPClient) performOperation(ctx context.Context, objects []Pointer, dc } err = transferAdapter.Upload(ctx, link, object.Pointer, content) - if err != nil { return err } diff --git a/modules/markup/markdown/goldmark.go b/modules/markup/markdown/goldmark.go index 3dc5530e00..178e3d2fdd 100644 --- a/modules/markup/markdown/goldmark.go +++ b/modules/markup/markdown/goldmark.go @@ -440,7 +440,6 @@ func (r *HTMLRenderer) renderIcon(w util.BufWriter, source []byte, node ast.Node var err error _, err = w.WriteString(fmt.Sprintf(``, name)) - if err != nil { return ast.WalkStop, err } diff --git a/routers/api/v1/repo/commits.go b/routers/api/v1/repo/commits.go index 20d4405d6d..43b6400009 100644 --- a/routers/api/v1/repo/commits.go +++ b/routers/api/v1/repo/commits.go @@ -205,7 +205,6 @@ func GetAllCommits(ctx *context.APIContext) { Not: not, Revision: []string{baseCommit.ID.String()}, }) - if err != nil { ctx.Error(http.StatusInternalServerError, "GetCommitsCount", err) return @@ -245,7 +244,6 @@ func GetAllCommits(ctx *context.APIContext) { Not: not, Page: listOptions.Page, }) - if err != nil { ctx.Error(http.StatusInternalServerError, "CommitsByFileAndRange", err) return diff --git a/routers/web/feed/convert.go b/routers/web/feed/convert.go index 6dbc2c2cbc..66b01d3680 100644 --- a/routers/web/feed/convert.go +++ b/routers/web/feed/convert.go @@ -296,7 +296,6 @@ func releasesToFeedItems(ctx *context.Context, releases []*repo_model.Release, i }, Metas: rel.Repo.ComposeMetas(ctx), }, rel.Note) - if err != nil { return nil, err } diff --git a/services/repository/check.go b/services/repository/check.go index b874ede51f..5cdcc14679 100644 --- a/services/repository/check.go +++ b/services/repository/check.go @@ -91,7 +91,6 @@ func GitGcRepo(ctx context.Context, repo *repo_model.Repository, timeout time.Du var stdout string var err error stdout, _, err = command.RunStdString(&git.RunOpts{Timeout: timeout, Dir: repo.RepoPath()}) - if err != nil { log.Error("Repository garbage collection failed for %-v. Stdout: %s\nError: %v", repo, stdout, err) desc := fmt.Sprintf("Repository garbage collection failed for %s. Stdout: %s\nError: %v", repo.RepoPath(), stdout, err)