chore(ci): bump golangci-lint to 1.53 (#166)

Signed-off-by: Yoan Blanc <[email protected]>
editorconfig · Aug 9, 2023 · 83a3feb · 83a3feb
1 parent d17d599
commit 83a3feb
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 10 deletions.
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -17,9 +17,9 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.19.x
+          go-version: 1.20.x
 
       - name: golangci-lint
         uses: golangci/[email protected]
         with:
-          version: v1.52
+          version: v1.53
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.19.x
+          go-version: 1.20.x
       - name: go test
         run: go test -v ./...
   core-test:

diff --git a/.golangci.yml b/.golangci.yml
@@ -1,4 +1,22 @@
 linters-settings:
+  depguard:
+    rules:
+      main:
+        files:
+        - "!**/internal/**/*.go"
+        - "!$test"
+        allow:
+        - $gostd
+        - "github.com/editorconfig/editorconfig-core-go/v2"
+        - "github.com/hashicorp/go-multierror"
+        deny: []
+      internal:
+        files:
+        - "**/internal/**/*.go"
+        - "!$test"
+        allow:
+        - $gostd
+        - "github.com/google/go-cmp"
   gci:
     sections:
       - standard

diff --git a/definition.go b/definition.go
@@ -17,14 +17,14 @@ import (
 type Definition struct {
 	Selector string `ini:"-" json:"-"`
 
-	Charset                string            `ini:"charset" json:"charset,omitempty"`
+	Charset                string            `ini:"charset"      json:"charset,omitempty"`
 	IndentStyle            string            `ini:"indent_style" json:"indent_style,omitempty"`
-	IndentSize             string            `ini:"indent_size" json:"indent_size,omitempty"`
-	TabWidth               int               `ini:"-" json:"-"`
-	EndOfLine              string            `ini:"end_of_line" json:"end_of_line,omitempty"`
-	TrimTrailingWhitespace *bool             `ini:"-" json:"-"`
-	InsertFinalNewline     *bool             `ini:"-" json:"-"`
-	Raw                    map[string]string `ini:"-" json:"-"`
+	IndentSize             string            `ini:"indent_size"  json:"indent_size,omitempty"`
+	TabWidth               int               `ini:"-"            json:"-"`
+	EndOfLine              string            `ini:"end_of_line"  json:"end_of_line,omitempty"`
+	TrimTrailingWhitespace *bool             `ini:"-"            json:"-"`
+	InsertFinalNewline     *bool             `ini:"-"            json:"-"`
+	Raw                    map[string]string `ini:"-"            json:"-"`
 	version                string
 }