.cirrus.yml

@@ -31,7 +31,6 @@ 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
@@ -58,8 +57,7 @@ task:
   matrix:
     - name: "Go Lint $GOOS New$MODULES_NAME"
       env:
-        # gci seems to be buggy with --new-from-rev=
-        GOLANGCI_ARGS: "--new-from-rev=HEAD~ --disable=gci"
+        GOLANGCI_ARGS: "--new-from-rev=HEAD~"
     - name: "Go Lint $GOOS Mandatory$MODULES_NAME"
       env:
         # TODO: Re-enable dupword after ncdns issue #166 is fixed.
@@ -127,7 +125,6 @@ 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
@@ -198,7 +195,6 @@ 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,9 +1,4 @@
 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/btcsuite/btcd/rpcclient"
 	"github.com/hlandau/xlog"
+	"github.com/btcsuite/btcd/rpcclient"
 	"gopkg.in/hlandau/easyconfig.v1"
 	"gopkg.in/hlandau/easyconfig.v1/cflag"