From cbbe84581275ac066eb5238e662937d1bdd2ced0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20BIDON?= Date: Sun, 10 Aug 2025 15:02:57 +0200 Subject: [PATCH 1/2] ci: fixed auto-merge MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Frédéric BIDON --- .github/dependabot.yaml | 2 +- .github/workflows/auto-merge.yml | 2 +- .golangci.yml | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 7dc7009..9ce426e 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -37,7 +37,7 @@ updates: patterns: - "github.com/stretchr/testify" - golang.org-dependencies: + golang-org-dependencies: patterns: - "golang.org/*" diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 9420058..1f18207 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -35,7 +35,7 @@ jobs: GH_TOKEN: ${{secrets.GITHUB_TOKEN}} - name: Auto-merge dependabot PRs for golang.org updates - if: contains(steps.metadata.outputs.dependency-group, 'golang.org-dependencies') + if: contains(steps.metadata.outputs.dependency-group, 'golang-org-dependencies') run: gh pr merge --auto --rebase "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} diff --git a/.golangci.yml b/.golangci.yml index 015e33a..568ce16 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -16,6 +16,7 @@ linters: - godox - gosmopolitan - inamedparam + - intrange # disabled while < go1.22 - ireturn - lll - musttag @@ -63,3 +64,12 @@ formatters: - third_party$ - builtin$ - examples$ +issues: + # Maximum issues count per one linter. + # Set to 0 to disable. + # Default: 50 + max-issues-per-linter: 0 + # Maximum count of issues with the same text. + # Set to 0 to disable. + # Default: 3 + max-same-issues: 0 From 0f30dac656da1fa91fe887f66eff1cea8f93c910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20BIDON?= Date: Sun, 10 Aug 2025 15:03:33 +0200 Subject: [PATCH 2/2] fix(lint): fixed false positives in tests (testifylint) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Frédéric BIDON --- schema_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schema_test.go b/schema_test.go index 8d9085c..9f83de9 100644 --- a/schema_test.go +++ b/schema_test.go @@ -200,9 +200,9 @@ func TestSchema(t *testing.T) { exp1 := expEx[0].(map[string]interface{}) exp2 := expEx[1].(map[string]interface{}) - assert.EqualValues(t, exp1["id"], ex1["id"]) + assert.EqualValues(t, exp1["id"], ex1["id"]) //nolint:testifylint // false positive: types are different assert.Equal(t, exp1["name"], ex1["name"]) - assert.EqualValues(t, exp2["id"], ex2["id"]) + assert.EqualValues(t, exp2["id"], ex2["id"]) //nolint:testifylint // false positive: types are different assert.Equal(t, exp2["name"], ex2["name"]) }