From 035bba89f5788c927367918b27cc1c2ba4631bd3 Mon Sep 17 00:00:00 2001 From: Antonin Delpeuch Date: Thu, 11 Apr 2024 14:09:19 +0200 Subject: [PATCH 1/2] Update golangci-lint to 1.57.2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0666e5562..1c44ff826 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ XGO_VERSION := go-1.21.x AIR_PACKAGE ?= github.com/cosmtrek/air@v1.49.0 # renovate: datasource=go EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/cmd/editorconfig-checker@2.7.0 # renovate: datasource=go GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.6.0 # renovate: datasource=go -GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.56.1 # renovate: datasource=go +GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.57.2 # renovate: datasource=go GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.11 # renovate: datasource=go MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/misspell@v0.4.1 # renovate: datasource=go SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.30.6-0.20240201115257-bcc7c78b7786 # renovate: datasource=go From 592c20c7d44cc42a86527a23d961e9d6e4fcae40 Mon Sep 17 00:00:00 2001 From: Antonin Delpeuch Date: Thu, 11 Apr 2024 14:13:36 +0200 Subject: [PATCH 2/2] Fix spelling mistakes caught by golangci-lint --- cmd/hook.go | 2 +- modules/git/repo_attribute_test.go | 4 ++-- tests/integration/editor_test.go | 2 +- tests/integration/size_translations_test.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/hook.go b/cmd/hook.go index 04df7ce18..81955e753 100644 --- a/cmd/hook.go +++ b/cmd/hook.go @@ -782,7 +782,7 @@ func writeFlushPktLine(ctx context.Context, out io.Writer) error { return nil } -// Write an Pkt-Line based on `data` to `out` according to the specifcation. +// Write an Pkt-Line based on `data` to `out` according to the specification. // https://git-scm.com/docs/protocol-common func writeDataPktLine(ctx context.Context, out io.Writer, data []byte) error { // Implementations SHOULD NOT send an empty pkt-line ("0004"). diff --git a/modules/git/repo_attribute_test.go b/modules/git/repo_attribute_test.go index 9b7b43d51..e9f745441 100644 --- a/modules/git/repo_attribute_test.go +++ b/modules/git/repo_attribute_test.go @@ -225,13 +225,13 @@ func TestGitAttributeCheckerError(t *testing.T) { ac, err := gitRepo.GitAttributeChecker("", "linguist-language") require.NoError(t, err) - // calling CheckPath before would allow git to cache part of it and succesfully return later + // calling CheckPath before would allow git to cache part of it and successfully return later assert.NoError(t, os.RemoveAll(gitRepo.Path)) _, err = ac.CheckPath("i-am-a-python.p") if err == nil { t.Skip( - "git check-attr started too fast and CheckPath was succesful (and likely cached)", + "git check-attr started too fast and CheckPath was successful (and likely cached)", "https://codeberg.org/forgejo/forgejo/issues/2948", ) } diff --git a/tests/integration/editor_test.go b/tests/integration/editor_test.go index f2f312b8a..ff3ac02b1 100644 --- a/tests/integration/editor_test.go +++ b/tests/integration/editor_test.go @@ -391,7 +391,7 @@ func TestCommitMail(t *testing.T) { t.Run("Upload", func(t *testing.T) { defer tests.PrintCurrentTest(t)() - // Upload two seperate times, so we have two different 'uploads' that can + // Upload two separate times, so we have two different 'uploads' that can // be used indepently of each other. uploadFile := func(t *testing.T, name, content string) string { t.Helper() diff --git a/tests/integration/size_translations_test.go b/tests/integration/size_translations_test.go index 78cd16795..1ee5f7b36 100644 --- a/tests/integration/size_translations_test.go +++ b/tests/integration/size_translations_test.go @@ -89,7 +89,7 @@ func TestDataSizeTranslation(t *testing.T) { fullSize = noDigits.ReplaceAllString(fullSize, "") assert.Equal(t, "git: КиБ; lfs: Б", fullSize) - // Check if file sizes are correclty translated + // Check if file sizes are correctly translated testFileSizeTranslated(t, session, path.Join(testUser, testRepoName, "src/branch/main/137byteFile.txt"), "137 Б") testFileSizeTranslated(t, session, path.Join(testUser, testRepoName, "src/branch/main/1.5kibFile.txt"), "1,5 КиБ") testFileSizeTranslated(t, session, path.Join(testUser, testRepoName, "src/branch/main/1.25mibFile.txt"), "1,3 МиБ")