Skip to content

Update tool dependencies #29030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.5.0
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/[email protected].0
GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.6.0
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/[email protected].2
GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/[email protected]
MISSPELL_PACKAGE ?= github.com/client9/misspell/cmd/[email protected]
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/[email protected]
XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest
GO_LICENSES_PACKAGE ?= github.com/google/[email protected]
GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/[email protected].1
ACTIONLINT_PACKAGE ?= github.com/rhysd/actionlint/cmd/[email protected].25
GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/[email protected].3
ACTIONLINT_PACKAGE ?= github.com/rhysd/actionlint/cmd/[email protected].26

DOCKER_IMAGE ?= gitea/gitea
DOCKER_TAG ?= latest
Expand Down
1 change: 0 additions & 1 deletion models/asymkey/gpg_key_verify.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion modules/lfs/http_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
1 change: 0 additions & 1 deletion modules/markup/markdown/goldmark.go
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,6 @@ func (r *HTMLRenderer) renderIcon(w util.BufWriter, source []byte, node ast.Node

var err error
_, err = w.WriteString(fmt.Sprintf(`<i class="icon %s"></i>`, name))

if err != nil {
return ast.WalkStop, err
}
Expand Down
2 changes: 0 additions & 2 deletions routers/api/v1/repo/commits.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -245,7 +244,6 @@ func GetAllCommits(ctx *context.APIContext) {
Not: not,
Page: listOptions.Page,
})

if err != nil {
ctx.Error(http.StatusInternalServerError, "CommitsByFileAndRange", err)
return
Expand Down
1 change: 0 additions & 1 deletion routers/web/feed/convert.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
1 change: 0 additions & 1 deletion services/repository/check.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down