From 00fa33c300c384eaa3f2b929d4d54568a412b627 Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 2 Feb 2024 18:12:39 +0100 Subject: [PATCH 1/3] Update tool dependencies --- Makefile | 12 ++++++------ 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, 6 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 068dda5f52b17..6bbc68e792def 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 -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 +AIR_PACKAGE ?= github.com/cosmtrek/air@v1.49.0 +EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/cmd/editorconfig-checker@2.8.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 98a3e7d390cfa..4cf46ab556e3a 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 de0b1e4fede49..e06879baea4fe 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 3dc5530e008c8..178e3d2fddf87 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 20d4405d6d4f6..43b6400009875 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 6dbc2c2cbcf11..66b01d36809cd 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 b874ede51fdbc..5cdcc146797c9 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) From b2f35fbfd8ff822b3f67f1c74db134302fe458b6 Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 2 Feb 2024 18:18:37 +0100 Subject: [PATCH 2/3] fix module path --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6bbc68e792def..23817a355f4e3 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ COMMA := , XGO_VERSION := go-1.21.x AIR_PACKAGE ?= github.com/cosmtrek/air@v1.49.0 -EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/cmd/editorconfig-checker@2.8.0 +EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v2/cmd/editorconfig-checker@2.8.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 From 2f684d112b658a29ade6b61b8aa0cebfcd8b87ba Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 2 Feb 2024 18:26:55 +0100 Subject: [PATCH 3/3] downgrade editorconfig-checker to 2.7.0 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 23817a355f4e3..273ae1fa68045 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ COMMA := , XGO_VERSION := go-1.21.x AIR_PACKAGE ?= github.com/cosmtrek/air@v1.49.0 -EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v2/cmd/editorconfig-checker@2.8.0 +EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/cmd/editorconfig-checker@2.7.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