diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index d7ea310..4297c6b 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -17,9 +17,11 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.20.x + go-version: 1.22.x - name: golangci-lint uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 #v6.1.0 + env: + GOTOOLCHAIN: local with: - version: v1.56 + version: v1.59 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bcd968e..06fbff2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.20.x + go-version: 1.22.x - name: go test run: go test -v ./... core-test: diff --git a/.golangci.yml b/.golangci.yml index d562223..0976eab 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -29,18 +29,11 @@ linters-settings: linters: enable-all: true disable: - - deadcode - - exhaustivestruct + - execinquery - exhaustruct - - golint - gomnd - - ifshort - - interfacer - - maligned - - nosnakecase - - scopelint - - structcheck + - mnd - tagliatelle - - varcheck + - typecheck - varnamelen fast: false diff --git a/Dockerfile b/Dockerfile index c913170..1c55815 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/ca-certificates:v0.8 +FROM alpine:3.20 COPY editorconfig /usr/local/bin/ diff --git a/fnmatch_test.go b/fnmatch_test.go index 05b3f36..3147105 100644 --- a/fnmatch_test.go +++ b/fnmatch_test.go @@ -28,7 +28,6 @@ func TestTranslate(t *testing.T) { } for _, test := range tests { - test := test t.Run(test.pattern, func(t *testing.T) { t.Parallel() diff --git a/go.mod b/go.mod index 6d7e823..ce4f290 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,12 @@ module github.com/editorconfig/editorconfig-core-go/v2 -go 1.20 +go 1.22.0 + +toolchain go1.23.0 require ( github.com/google/go-cmp v0.6.0 - golang.org/x/mod v0.20.0 + golang.org/x/mod v0.21.0 gopkg.in/ini.v1 v1.67.0 ) diff --git a/go.sum b/go.sum index 1a0a2ee..a77d4a3 100644 --- a/go.sum +++ b/go.sum @@ -7,8 +7,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= -golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=