Merge namecoin/ncdns#171: Cirrus: Disable gci for New task

093d77f527 Cirrus: Disable gci for New task (Jeremy Rand)
cdfc933805 GolangCI: Add gci config (Jeremy Rand)

Pull request description:

  gci seems to crash while processing this repo, for reasons I don't understand.

Top commit has no ACKs.

Tree-SHA512: 4421d3a47b5b394416cb7b5ef8428e558d713a8827a7a4587ac67fa0375c5334f191bf2f9b576b7cbc589964cf47583191e66edd38e7c2555791c5d8144071e3

.cirrus.yml

@@ -31,6 +31,7 @@ task:
         - git clone https://github.com/namecoin/certinject.git
         - cd certinject
         - go mod init github.com/namecoin/certinject
+        - go mod edit -replace github.com/coreos/go-systemd=github.com/coreos/go-systemd/v22@latest
         - go mod tidy
         - go generate ./...
         - go mod tidy
@@ -57,7 +58,8 @@ task:
   matrix:
     - name: "Go Lint $GOOS New$MODULES_NAME"
       env:
-        GOLANGCI_ARGS: "--new-from-rev=HEAD~"
+        # gci seems to be buggy with --new-from-rev=
+        GOLANGCI_ARGS: "--new-from-rev=HEAD~ --disable=gci"
     - name: "Go Lint $GOOS Mandatory$MODULES_NAME"
       env:
         # TODO: Re-enable dupword after ncdns issue #166 is fixed.
@@ -125,6 +127,7 @@ task:
         - git clone https://github.com/namecoin/certinject.git
         - cd certinject
         - go mod init github.com/namecoin/certinject
+        - go mod edit -replace github.com/coreos/go-systemd=github.com/coreos/go-systemd/v22@latest
         - go mod tidy
         - go generate ./...
         - go mod tidy
@@ -195,6 +198,7 @@ task:
         - git clone https://github.com/namecoin/certinject.git
         - cd certinject
         - go mod init github.com/namecoin/certinject
+        - go mod edit -replace github.com/coreos/go-systemd=github.com/coreos/go-systemd/v22@latest
         - go mod tidy
         - go generate ./...
         - go mod tidy

.golangci.yml

@@ -1,4 +1,9 @@
 linters-settings:
+  gci:
+    sections:
+      - standard
+      - default
+      - prefix(github.com/namecoin)
   goimports:
     local-prefixes: "github.com/namecoin"
   gomoddirectives:

cmd/ncdumpzone/ncdumpzone.go

@@ -3,8 +3,8 @@ package main
 import (
 	"os"
 
-	"github.com/hlandau/xlog"
 	"github.com/btcsuite/btcd/rpcclient"
+	"github.com/hlandau/xlog"
 	"gopkg.in/hlandau/easyconfig.v1"
 	"gopkg.in/hlandau/easyconfig.v1/cflag"