From ff62724c8e2dfc30c8e6f903201c7c1b87cf74be Mon Sep 17 00:00:00 2001 From: Andrew Pennebaker Date: Tue, 13 Aug 2024 22:16:29 -0500 Subject: [PATCH] update go; update mage-extras; lint --- .tool-versions | 2 +- DEVELOPMENT.md | 2 +- go.mod | 4 ++-- go.sum | 4 ++-- magefile.go | 14 +++++++++--- makefile | 3 ++- .../mcandre/mage-extras/.rubberstamp | 2 +- .../mcandre/mage-extras/.tool-versions | 2 +- .../mcandre/mage-extras/DEVELOPMENT.md | 2 +- .../github.com/mcandre/mage-extras/README.md | 3 ++- .../mcandre/mage-extras/deadcode.go | 15 +++++++++++++ .../mcandre/mage-extras/magefile.go | 22 +++++++++++-------- .../github.com/mcandre/mage-extras/makefile | 4 ++-- vendor/modules.txt | 4 ++-- 14 files changed, 56 insertions(+), 27 deletions(-) create mode 100644 vendor/github.com/mcandre/mage-extras/deadcode.go diff --git a/.tool-versions b/.tool-versions index bff0740..de2f08a 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,3 @@ -golang 1.22.5 +golang 1.23.0 nodejs 20.10.0 rust 1.75.0 diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 82a1703..f2c2dbe 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -1,6 +1,6 @@ # BUILDTIME REQUIREMENTS -* [Go](https://go.dev/) 1.22.5+ +* [Go](https://go.dev/) 1.23.0+ * POSIX compatible [make](https://pubs.opengroup.org/onlinepubs/9699919799/utilities/make.html) * [Node.js](https://nodejs.org/en) 20.10.0+ * [Rust](https://www.rust-lang.org/) 1.75.0+ diff --git a/go.mod b/go.mod index a9e5b2f..6146747 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,10 @@ module github.com/mcandre/buttery -go 1.22 +go 1.23 require ( github.com/andybons/gogif v0.0.0-20140526152223-16d573594812 github.com/anthonynsimon/bild v0.13.0 github.com/magefile/mage v1.14.0 - github.com/mcandre/mage-extras v0.0.17 + github.com/mcandre/mage-extras v0.0.18 ) diff --git a/go.sum b/go.sum index 477afd5..f0302ff 100644 --- a/go.sum +++ b/go.sum @@ -15,8 +15,8 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt github.com/magefile/mage v1.14.0 h1:6QDX3g6z1YvJ4olPhT1wksUcSa/V0a1B+pJb73fBjyo= github.com/magefile/mage v1.14.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/mcandre/mage-extras v0.0.17 h1:Ihe4gfRYpn1Goowzk339YmYC1K9jXN2aJ9GaMUtiGDU= -github.com/mcandre/mage-extras v0.0.17/go.mod h1:OvwmvvrYj+Eb+8LCL8ScRMJ9wr0KMbsbV1Ry68zH99k= +github.com/mcandre/mage-extras v0.0.18 h1:f7aZZGmqnElr3GcMZQvz//cn1uxneHEMrY5X7NysQIM= +github.com/mcandre/mage-extras v0.0.18/go.mod h1:zr+/cO9v8EtPmjHMVYx7ijYrbT3tfJSNgXc9ze6LJ4s= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= diff --git a/magefile.go b/magefile.go index c7a02da..b556745 100644 --- a/magefile.go +++ b/magefile.go @@ -38,8 +38,11 @@ func Test() error { return cmd.Run() } -// GoVet runs go vet with shadow checks enabled. -func GoVet() error { return mageextras.GoVetShadow() } +// Deadcode runs deadcode. +func Deadcode() error { return mageextras.Deadcode("./...") } + +// GoVet runs default go vet analyzers. +func GoVet() error { return mageextras.GoVet() } // Gofmt runs gofmt. func GoFmt() error { return mageextras.GoFmt("-s", "-w") } @@ -53,6 +56,9 @@ func Errcheck() error { return mageextras.Errcheck("-blank") } // Nakedret runs nakedret. func Nakedret() error { return mageextras.Nakedret("-l", "0") } +// Shadow runs go vet with shadow checks enabled. +func Shadow() error { return mageextras.GoVetShadow() } + // Staticcheck runs staticcheck. func Staticcheck() error { return mageextras.Staticcheck() } @@ -69,11 +75,13 @@ func Unmake() error { // Lint runs the lint suite. func Lint() error { - mg.Deps(GoVet) + mg.Deps(Deadcode) mg.Deps(GoFmt) mg.Deps(GoImports) + mg.Deps(GoVet) mg.Deps(Errcheck) mg.Deps(Nakedret) + mg.Deps(Shadow) mg.Deps(Staticcheck) mg.Deps(Unmake) return nil diff --git a/makefile b/makefile index 76b913d..5427e5f 100644 --- a/makefile +++ b/makefile @@ -9,11 +9,12 @@ all: go install github.com/kisielk/errcheck@v1.7.0 go install github.com/magefile/mage@v1.14.0 go install github.com/mcandre/factorio/cmd/factorio@v0.0.6 + go install golang.org/x/tools/cmd/deadcode@latest go install golang.org/x/tools/cmd/goimports@latest go install golang.org/x/tools/cmd/stringer@latest go install golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow@latest go install golang.org/x/vuln/cmd/govulncheck@latest - go install honnef.co/go/tools/cmd/staticcheck@2023.1.3 + go install honnef.co/go/tools/cmd/staticcheck@2024.1 go mod tidy npm install -g snyk diff --git a/vendor/github.com/mcandre/mage-extras/.rubberstamp b/vendor/github.com/mcandre/mage-extras/.rubberstamp index 6bebc86..6775f73 100644 --- a/vendor/github.com/mcandre/mage-extras/.rubberstamp +++ b/vendor/github.com/mcandre/mage-extras/.rubberstamp @@ -1 +1 @@ -Sat Jul 13 00:13:57 UTC 2024 +Thu Aug 1 00:05:52 UTC 2024 diff --git a/vendor/github.com/mcandre/mage-extras/.tool-versions b/vendor/github.com/mcandre/mage-extras/.tool-versions index 4b85511..de2f08a 100644 --- a/vendor/github.com/mcandre/mage-extras/.tool-versions +++ b/vendor/github.com/mcandre/mage-extras/.tool-versions @@ -1,3 +1,3 @@ -golang 1.21.5 +golang 1.23.0 nodejs 20.10.0 rust 1.75.0 diff --git a/vendor/github.com/mcandre/mage-extras/DEVELOPMENT.md b/vendor/github.com/mcandre/mage-extras/DEVELOPMENT.md index afbb51d..df2c6d8 100644 --- a/vendor/github.com/mcandre/mage-extras/DEVELOPMENT.md +++ b/vendor/github.com/mcandre/mage-extras/DEVELOPMENT.md @@ -1,6 +1,6 @@ # BUILDTIME REQUIREMENTS -* [Go](https://golang.org/) 1.21.5+ +* [Go](https://go.dev/) 1.23.0+ * POSIX compatible [make](https://pubs.opengroup.org/onlinepubs/9699919799/utilities/make.html) * [Node.js](https://nodejs.org/en) 20.10.0+ * [Rust](https://www.rust-lang.org/) 1.75.0+ diff --git a/vendor/github.com/mcandre/mage-extras/README.md b/vendor/github.com/mcandre/mage-extras/README.md index 293d5f3..a8719ec 100644 --- a/vendor/github.com/mcandre/mage-extras/README.md +++ b/vendor/github.com/mcandre/mage-extras/README.md @@ -45,7 +45,7 @@ Mage is highly agnostic about workflows. mage-extras is a little more opinionate # DOCUMENTATION -https://godoc.org/github.com/mcandre/mage-extras +https://pkg.go.dev/github.com/mcandre/mage-extras # LICENSE @@ -53,6 +53,7 @@ BSD-2-Clause # RUNTIME REQUIREMENTS +* [Go](https://go.dev/) 1.23.0+ * [Mage](https://magefile.org/) (e.g., `go install github.com/magefile/mage`) ## Recommended diff --git a/vendor/github.com/mcandre/mage-extras/deadcode.go b/vendor/github.com/mcandre/mage-extras/deadcode.go new file mode 100644 index 0000000..e936705 --- /dev/null +++ b/vendor/github.com/mcandre/mage-extras/deadcode.go @@ -0,0 +1,15 @@ +package mageextras + +import ( + "os" + "os/exec" +) + +// Deadcode runs deadcode. +func Deadcode(args ...string) error { + cmd := exec.Command("deadcode") + cmd.Args = append(cmd.Args, args...) + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + return cmd.Run() +} diff --git a/vendor/github.com/mcandre/mage-extras/magefile.go b/vendor/github.com/mcandre/mage-extras/magefile.go index c5a25f2..0492350 100644 --- a/vendor/github.com/mcandre/mage-extras/magefile.go +++ b/vendor/github.com/mcandre/mage-extras/magefile.go @@ -19,15 +19,15 @@ var CoverHTML = "cover.html" var CoverProfile = "cover.out" // Govulncheck runs govulncheck. -func Govulncheck() error { return mageextras.Govulncheck("./...") } +func Govulncheck() error { return mageextras.Govulncheck("-scan", "package", "./...") } -// SnykTest runs Snyk SCA. -func SnykTest() error { return mageextras.SnykTest() } +// Snyk runs Snyk SCA. +func Snyk() error { return mageextras.SnykTest() } // Audit runs a security audit. func Audit() error { - mg.Deps(mageextras.Govulncheck("./...")) - return SnykTest() + mg.Deps(Govulncheck) + return Snyk() } // CoverageHTML generates HTML formatted coverage data. @@ -42,21 +42,24 @@ func CoverageProfile() error { return mageextras.CoverageProfile(CoverProfile) } // Test executes the unit test suite. func Test() error { return mageextras.UnitTest() } -// GoVet runs go vet with shadow checks enabled. -func GoVet() error { return mageextras.GoVetShadow() } - // Gofmt runs gofmt. func GoFmt() error { return mageextras.GoFmt("-s", "-w") } // GoImports runs goimports. func GoImports() error { return mageextras.GoImports("-w") } +// GoVet runs default go vet analyzers. +func GoVet() error { return mageextras.GoVet() } + // Errcheck runs errcheck. func Errcheck() error { return mageextras.Errcheck("-blank") } // Nakedret runs nakedret. func Nakedret() error { return mageextras.Nakedret("-l", "0") } +// Shadow runs go vet with shadow checks enabled. +func Shadow() error { return mageextras.GoVetShadow() } + // Staticcheck runs staticcheck. func Staticcheck() error { return mageextras.Staticcheck() } @@ -73,11 +76,12 @@ func Unmake() error { // Lint runs the lint suite. func Lint() error { - mg.Deps(GoVet) mg.Deps(GoFmt) mg.Deps(GoImports) + mg.Deps(GoVet) mg.Deps(Errcheck) mg.Deps(Nakedret) + mg.Deps(Shadow) mg.Deps(Staticcheck) mg.Deps(Unmake) return nil diff --git a/vendor/github.com/mcandre/mage-extras/makefile b/vendor/github.com/mcandre/mage-extras/makefile index be01ada..436b3ef 100644 --- a/vendor/github.com/mcandre/mage-extras/makefile +++ b/vendor/github.com/mcandre/mage-extras/makefile @@ -6,12 +6,12 @@ all: cargo install --force unmake@0.0.17 go install github.com/alexkohler/nakedret@v1.0.1 - go install github.com/kisielk/errcheck@v1.6.3 + go install github.com/kisielk/errcheck@v1.7.0 go install github.com/magefile/mage@v1.14.0 go install golang.org/x/tools/cmd/goimports@latest go install golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow@latest go install golang.org/x/vuln/cmd/govulncheck@latest - go install honnef.co/go/tools/cmd/staticcheck@2023.1.3 + go install honnef.co/go/tools/cmd/staticcheck@2024.1 go mod tidy npm install -g snyk diff --git a/vendor/modules.txt b/vendor/modules.txt index ffbef1e..7ef6fde 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -10,6 +10,6 @@ github.com/anthonynsimon/bild/transform # github.com/magefile/mage v1.14.0 ## explicit; go 1.12 github.com/magefile/mage/mg -# github.com/mcandre/mage-extras v0.0.17 -## explicit; go 1.21 +# github.com/mcandre/mage-extras v0.0.18 +## explicit; go 1.23 github.com/mcandre/mage-extras