Fix go-systemd import with Go modules

See coreos/go-systemd#321
namecoin · Jun 17, 2021 · 5e6b643 · 5e6b643
1 parent 468f40c
commit 5e6b643
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -37,8 +37,7 @@ task:
       fetch_script:
         - cd $(go env GOPATH)/src/github.com/"$CIRRUS_REPO_FULL_NAME"
         - go mod init
-        - go mod tidy
-        - go mod edit -replace github.com/namecoin/x509-compressed=../x509-compressed
+        - go mod edit -replace github.com/coreos/go-systemd=github.com/coreos/go-systemd/v22@latest -replace github.com/namecoin/x509-compressed=../x509-compressed
         - go mod tidy
   lint_script:
     - cd $(go env GOPATH)/src/github.com/$CIRRUS_REPO_FULL_NAME/
@@ -118,8 +117,7 @@ task:
       fetch_script:
         - cd $(go env GOPATH)/src/github.com/"$CIRRUS_REPO_FULL_NAME"
         - go mod init
-        - go mod tidy
-        - go mod edit -replace github.com/namecoin/x509-compressed=../x509-compressed
+        - go mod edit -replace github.com/coreos/go-systemd=github.com/coreos/go-systemd/v22@latest -replace github.com/namecoin/x509-compressed=../x509-compressed
         - go mod tidy
         # Get the test suite
         - mkdir -p $(go env GOPATH)/src/github.com/hlandau
@@ -175,8 +173,7 @@ task:
       fetch_script:
         - cd $(go env GOPATH)/src/github.com/"$CIRRUS_REPO_FULL_NAME"
         - go mod init
-        - go mod tidy
-        - go mod edit -replace github.com/namecoin/x509-compressed=../x509-compressed
+        - go mod edit -replace github.com/coreos/go-systemd=github.com/coreos/go-systemd/v22@latest -replace github.com/namecoin/x509-compressed=../x509-compressed
         - go mod tidy
   build_script:
     - rm -rf idist

diff --git a/.golangci.yml b/.golangci.yml
@@ -5,3 +5,4 @@ linters-settings:
     replace-local: true
     replace-allow-list:
       - "github.com/namecoin/x509-compressed"
+      - "github.com/coreos/go-systemd"
diff --git a/README.md b/README.md
@@ -113,8 +113,7 @@ Option B: Using Go build commands with Go modules (works on any platform with Ba
 
    ~~~
    go mod init
-   go mod tidy
-   go mod edit -replace github.com/namecoin/x509-compressed=../x509-compressed
+   go mod edit -replace github.com/coreos/go-systemd=github.com/coreos/go-systemd/v22@latest -replace github.com/namecoin/x509-compressed=../x509-compressed
    go mod tidy
    ~~~