From 3520d4f56bd54254f230efb9d23b701987ee1748 Mon Sep 17 00:00:00 2001 From: Josh Rickmar Date: Tue, 11 Feb 2025 20:01:34 +0000 Subject: [PATCH] Use Go 1.24 module tool directives It is no longer necessary to keep track of the executables with blank imports in source files ignored with build tags. --- dcrctl/go.mod | 4 +++- dcrctl/require.go | 11 ----------- dcrd/go.mod | 8 +++++++- dcrd/require.go | 13 ------------- dcrdex/go.mod | 7 ++++++- dcrdex/require.go | 12 ------------ dcrlnd/go.mod | 7 ++++++- dcrlnd/require.go | 12 ------------ dcrwallet/go.mod | 4 +++- dcrwallet/require.go | 11 ----------- decred-release/go.mod | 4 +++- decred-release/require.go | 11 ----------- politeia/go.mod | 7 ++++++- politeia/require.go | 12 ------------ 14 files changed, 34 insertions(+), 89 deletions(-) delete mode 100644 dcrctl/require.go delete mode 100644 dcrd/require.go delete mode 100644 dcrdex/require.go delete mode 100644 dcrlnd/require.go delete mode 100644 dcrwallet/require.go delete mode 100644 decred-release/require.go delete mode 100644 politeia/require.go diff --git a/dcrctl/go.mod b/dcrctl/go.mod index c22335f..ac0d1e3 100644 --- a/dcrctl/go.mod +++ b/dcrctl/go.mod @@ -2,7 +2,7 @@ module decred.org/release/v2/dcrctl go 1.17 -require decred.org/dcrctl v0.0.0-20241111214514-3d8c38ba43ab +require decred.org/dcrctl v0.0.0-20241111214514-3d8c38ba43ab // indirect require ( decred.org/dcrwallet/v4 v4.2.0 // indirect @@ -27,3 +27,5 @@ require ( golang.org/x/sys v0.23.0 // indirect lukechampine.com/blake3 v1.3.0 // indirect ) + +tool decred.org/dcrctl diff --git a/dcrctl/require.go b/dcrctl/require.go deleted file mode 100644 index eb509ae..0000000 --- a/dcrctl/require.go +++ /dev/null @@ -1,11 +0,0 @@ -//go:build require -// +build require - -// This file exists to prevent go mod tidy from removing requires on tools. -// It is excluded from the build as it is not permitted to import main packages. - -package main - -import ( - _ "decred.org/dcrctl" -) diff --git a/dcrd/go.mod b/dcrd/go.mod index 414931c..05d4483 100644 --- a/dcrd/go.mod +++ b/dcrd/go.mod @@ -2,7 +2,7 @@ module decred.org/release/v2/dcrd go 1.19 -require github.com/decred/dcrd v1.9.5 +require github.com/decred/dcrd v1.9.5 // indirect require ( decred.org/cspp/v2 v2.3.0 // indirect @@ -55,3 +55,9 @@ require ( golang.org/x/text v0.17.0 // indirect lukechampine.com/blake3 v1.3.0 // indirect ) + +tool ( + github.com/decred/dcrd + github.com/decred/dcrd/cmd/gencerts + github.com/decred/dcrd/cmd/promptsecret +) diff --git a/dcrd/require.go b/dcrd/require.go deleted file mode 100644 index 71c7b75..0000000 --- a/dcrd/require.go +++ /dev/null @@ -1,13 +0,0 @@ -//go:build require -// +build require - -// This file exists to prevent go mod tidy from removing requires on tools. -// It is excluded from the build as it is not permitted to import main packages. - -package main - -import ( - _ "github.com/decred/dcrd" - _ "github.com/decred/dcrd/cmd/gencerts" - _ "github.com/decred/dcrd/cmd/promptsecret" -) diff --git a/dcrdex/go.mod b/dcrdex/go.mod index b558896..cdcbb79 100644 --- a/dcrdex/go.mod +++ b/dcrdex/go.mod @@ -2,7 +2,7 @@ module decred.org/release/v2/dcrdex go 1.21 -require decred.org/dcrdex v1.0.2 +require decred.org/dcrdex v1.0.2 // indirect require ( decred.org/cspp/v2 v2.3.0 // indirect @@ -176,3 +176,8 @@ require ( lukechampine.com/blake3 v1.3.0 // indirect rsc.io/tmplfunc v0.0.3 // indirect ) + +tool ( + decred.org/dcrdex/client/cmd/bisonw + decred.org/dcrdex/client/cmd/bwctl +) diff --git a/dcrdex/require.go b/dcrdex/require.go deleted file mode 100644 index ee1dc0a..0000000 --- a/dcrdex/require.go +++ /dev/null @@ -1,12 +0,0 @@ -//go:build require -// +build require - -// This file exists to prevent go mod tidy from removing requires on tools. -// It is excluded from the build as it is not permitted to import main packages. - -package main - -import ( - _ "decred.org/dcrdex/client/cmd/bisonw" - _ "decred.org/dcrdex/client/cmd/bwctl" -) diff --git a/dcrlnd/go.mod b/dcrlnd/go.mod index 3b255f3..103b47c 100644 --- a/dcrlnd/go.mod +++ b/dcrlnd/go.mod @@ -2,7 +2,7 @@ module decred.org/release/v2/dcrlnd go 1.20 -require github.com/decred/dcrlnd v0.7.5 +require github.com/decred/dcrlnd v0.7.5 // indirect require ( decred.org/cspp/v2 v2.3.0 // indirect @@ -167,3 +167,8 @@ require ( lukechampine.com/blake3 v1.3.0 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) + +tool ( + github.com/decred/dcrlnd/cmd/dcrlncli + github.com/decred/dcrlnd/cmd/dcrlnd +) diff --git a/dcrlnd/require.go b/dcrlnd/require.go deleted file mode 100644 index f372bb2..0000000 --- a/dcrlnd/require.go +++ /dev/null @@ -1,12 +0,0 @@ -//go:build require -// +build require - -// This file exists to prevent go mod tidy from removing requires on tools. -// It is excluded from the build as it is not permitted to import main packages. - -package main - -import ( - _ "github.com/decred/dcrlnd/cmd/dcrlncli" - _ "github.com/decred/dcrlnd/cmd/dcrlnd" -) diff --git a/dcrwallet/go.mod b/dcrwallet/go.mod index e959a63..4309dd6 100644 --- a/dcrwallet/go.mod +++ b/dcrwallet/go.mod @@ -2,7 +2,7 @@ module decred.org/release/v2/dcrwallet go 1.20 -require decred.org/dcrwallet/v4 v4.2.0 +require decred.org/dcrwallet/v4 v4.2.0 // indirect require ( decred.org/cspp/v2 v2.3.0 // indirect @@ -56,3 +56,5 @@ require ( google.golang.org/protobuf v1.27.1 // indirect lukechampine.com/blake3 v1.3.0 // indirect ) + +tool decred.org/dcrwallet/v4 diff --git a/dcrwallet/require.go b/dcrwallet/require.go deleted file mode 100644 index 91af32d..0000000 --- a/dcrwallet/require.go +++ /dev/null @@ -1,11 +0,0 @@ -//go:build require -// +build require - -// This file exists to prevent go mod tidy from removing requires on tools. -// It is excluded from the build as it is not permitted to import main packages. - -package main - -import ( - _ "decred.org/dcrwallet/v4" -) diff --git a/decred-release/go.mod b/decred-release/go.mod index 92cb547..35e2674 100644 --- a/decred-release/go.mod +++ b/decred-release/go.mod @@ -2,7 +2,7 @@ module decred.org/release/v2/decred-release go 1.17 -require github.com/decred/decred-release v1.8.2-0.20240830144532-abac5176e504 +require github.com/decred/decred-release v1.8.2-0.20240830144532-abac5176e504 // indirect require ( github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect @@ -22,3 +22,5 @@ require ( golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8 // indirect golang.org/x/sys v0.6.0 // indirect ) + +tool github.com/decred/decred-release/cmd/dcrinstall diff --git a/decred-release/require.go b/decred-release/require.go deleted file mode 100644 index 50fb570..0000000 --- a/decred-release/require.go +++ /dev/null @@ -1,11 +0,0 @@ -//go:build require -// +build require - -// This file exists to prevent go mod tidy from removing requires on tools. -// It is excluded from the build as it is not permitted to import main packages. - -package main - -import ( - _ "github.com/decred/decred-release/cmd/dcrinstall" -) diff --git a/politeia/go.mod b/politeia/go.mod index 70145a2..38288af 100644 --- a/politeia/go.mod +++ b/politeia/go.mod @@ -2,7 +2,7 @@ module decred.org/release/v2/politeia go 1.17 -require github.com/decred/politeia v1.5.0 +require github.com/decred/politeia v1.5.0 // indirect require ( decred.org/dcrwallet v1.7.0 // indirect @@ -47,3 +47,8 @@ require ( google.golang.org/grpc v1.46.0 // indirect google.golang.org/protobuf v1.28.0 // indirect ) + +tool ( + github.com/decred/politeia/politeiawww/cmd/politeiaverify + github.com/decred/politeia/politeiawww/cmd/politeiavoter +) diff --git a/politeia/require.go b/politeia/require.go deleted file mode 100644 index 9946481..0000000 --- a/politeia/require.go +++ /dev/null @@ -1,12 +0,0 @@ -//go:build require -// +build require - -// This file exists to prevent go mod tidy from removing requires on tools. -// It is excluded from the build as it is not permitted to import main packages. - -package main - -import ( - _ "github.com/decred/politeia/politeiawww/cmd/politeiaverify" - _ "github.com/decred/politeia/politeiawww/cmd/politeiavoter" -)