Merge pull request #993 from Elbehery/20250615_add_goimport_golangci-lint

ahrtr · web-flow · commit 092ee98898c0 · 2025-06-18T09:45:24.000+01:00
chore(CI): add goimports to linter
diff --git a/.github/workflows/failpoint_test.yaml b/.github/workflows/failpoint_test.yaml
@@ -15,6 +15,10 @@ jobs:
       - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
           go-version: ${{ steps.goversion.outputs.goversion }}
+      - name: Run golangci-lint
+        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
+        with:
+          version: v2.1.6
       - run: |
           make gofail-enable
           make test-failpoint
diff --git a/.github/workflows/robustness_template.yaml b/.github/workflows/robustness_template.yaml
@@ -29,6 +29,10 @@ jobs:
       - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
           go-version: ${{ steps.goversion.outputs.goversion }}
+      - name: Run golangci-lint
+        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
+        with:
+          version: v2.1.6
       - name: test-robustness
         run: |
           set -euo pipefail
diff --git a/.github/workflows/tests-template.yml b/.github/workflows/tests-template.yml
@@ -49,7 +49,7 @@ jobs:
               exit 1
               ;;
           esac
-      - name: golangci-lint
+      - name: Run golangci-lint
         uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
         with:
           version: v2.1.6
diff --git a/.github/workflows/tests_amd64.yaml b/.github/workflows/tests_amd64.yaml
@@ -23,4 +23,8 @@ jobs:
       - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
           go-version: ${{ steps.goversion.outputs.goversion }}
+      - name: Run golangci-lint
+        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
+        with:
+          version: v2.1.6
       - run: make coverage
diff --git a/.github/workflows/tests_arm64.yaml b/.github/workflows/tests_arm64.yaml
@@ -25,4 +25,8 @@ jobs:
       - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
           go-version: ${{ steps.goversion.outputs.goversion }}
+      - name: Run golangci-lint
+        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
+        with:
+          version: v2.1.6
       - run: make coverage
diff --git a/.github/workflows/tests_windows.yml b/.github/workflows/tests_windows.yml
@@ -39,7 +39,7 @@ jobs:
               ;;
           esac
         shell: bash
-      - name: golangci-lint
+      - name: Run golangci-lint
         uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
         with:
           version: v2.1.6
@@ -54,4 +54,8 @@ jobs:
       - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
           go-version: ${{ steps.goversion.outputs.goversion }}
+      - name: Run golangci-lint
+        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
+        with:
+          version: v2.1.6
       - run: make coverage
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,8 +1,14 @@
 formatters:
   enable:
+    - gci
     - gofmt
     - goimports
   settings: # please keep this alphabetized
+    gci:
+      sections:
+        - standard
+        - default
+        - prefix(go.etcd.io)
     goimports:
       local-prefixes:
         - go.etcd.io # Put imports beginning with prefix after 3rd-party packages.
diff --git a/bolt_aix.go b/bolt_aix.go
@@ -8,8 +8,9 @@ import (
 	"time"
 	"unsafe"
 
-	"go.etcd.io/bbolt/internal/common"
 	"golang.org/x/sys/unix"
+
+	"go.etcd.io/bbolt/internal/common"
 )
 
 // flock acquires an advisory lock on a file descriptor.
diff --git a/bolt_android.go b/bolt_android.go
@@ -6,8 +6,9 @@ import (
 	"time"
 	"unsafe"
 
-	"go.etcd.io/bbolt/internal/common"
 	"golang.org/x/sys/unix"
+
+	"go.etcd.io/bbolt/internal/common"
 )
 
 // flock acquires an advisory lock on a file descriptor.
diff --git a/bolt_solaris.go b/bolt_solaris.go
@@ -6,8 +6,9 @@ import (
 	"time"
 	"unsafe"
 
-	"go.etcd.io/bbolt/internal/common"
 	"golang.org/x/sys/unix"
+
+	"go.etcd.io/bbolt/internal/common"
 )
 
 // flock acquires an advisory lock on a file descriptor.
diff --git a/cmd/bbolt/main_test.go b/cmd/bbolt/main_test.go
@@ -14,14 +14,13 @@ import (
 	"sync"
 	"testing"
 
-	"go.etcd.io/bbolt/internal/btesting"
-	"go.etcd.io/bbolt/internal/guts_cli"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	bolt "go.etcd.io/bbolt"
 	main "go.etcd.io/bbolt/cmd/bbolt"
+	"go.etcd.io/bbolt/internal/btesting"
+	"go.etcd.io/bbolt/internal/guts_cli"
 )
 
 // Ensure the "info" command can print information about a database.
diff --git a/movebucket_test.go b/movebucket_test.go
@@ -7,11 +7,11 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"go.etcd.io/bbolt"
 	"go.etcd.io/bbolt/errors"
 	"go.etcd.io/bbolt/internal/btesting"
-
-	"github.com/stretchr/testify/require"
 )
 
 func TestTx_MoveBucket(t *testing.T) {
diff --git a/tests/dmflakey/dmflakey_test.go b/tests/dmflakey/dmflakey_test.go
@@ -12,11 +12,11 @@ import (
 	"testing"
 	"time"
 
-	testutils "go.etcd.io/bbolt/tests/utils"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/sys/unix"
+
+	testutils "go.etcd.io/bbolt/tests/utils"
 )
 
 func TestMain(m *testing.M) {
diff --git a/tests/robustness/powerfailure_test.go b/tests/robustness/powerfailure_test.go
@@ -19,11 +19,11 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/bbolt/tests/dmflakey"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/sys/unix"
+
+	"go.etcd.io/bbolt/tests/dmflakey"
 )
 
 var panicFailpoints = []string{

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,9 @@ import (`
`8`	`8`	`"time"`
`9`	`9`	`"unsafe"`
`10`	`10`
`11`		`- "go.etcd.io/bbolt/internal/common"`
`12`	`11`	`"golang.org/x/sys/unix"`
	`12`	`+`
	`13`	`+ "go.etcd.io/bbolt/internal/common"`
`13`	`14`	`)`
`14`	`15`
`15`	`16`	`// flock acquires an advisory lock on a file descriptor.`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,9 @@ import (`
`6`	`6`	`"time"`
`7`	`7`	`"unsafe"`
`8`	`8`
`9`		`- "go.etcd.io/bbolt/internal/common"`
`10`	`9`	`"golang.org/x/sys/unix"`
	`10`	`+`
	`11`	`+ "go.etcd.io/bbolt/internal/common"`
`11`	`12`	`)`
`12`	`13`
`13`	`14`	`// flock acquires an advisory lock on a file descriptor.`