Skip to content

Commit

Permalink
update go; govulncheck; update go links
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew Pennebaker committed Jul 14, 2024
1 parent 543f195 commit 2108a42
Show file tree
Hide file tree
Showing 12 changed files with 43 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
golang 1.21.5
golang 1.22.5
nodejs 20.10.0
rust 1.75.0
2 changes: 1 addition & 1 deletion DEVELOPMENT.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# BUILDTIME REQUIREMENTS

* [Docker](https://www.docker.com/) 20.10.12+
* [Go](https://golang.org/) 1.21.5+
* [Go](https://go.dev/) 1.22.5+
* 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+
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ You can see more Docker gears turning, apply the `tug -debug` flag. tug respects

# DOCUMENTATION

https://godoc.org/github.com/mcandre/tug
https://pkg.go.dev/github.com/mcandre/tug

# DOWNLOAD

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ go 1.21

require (
github.com/magefile/mage v1.14.0
github.com/mcandre/mage-extras v0.0.16
github.com/mcandre/mage-extras v0.0.17
)
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
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/mcandre/mage-extras v0.0.16 h1:T5va5gnxQiQOL5w9lE+37WSvCMu+rhiMV30XKSGNBb0=
github.com/mcandre/mage-extras v0.0.16/go.mod h1:OvwmvvrYj+Eb+8LCL8ScRMJ9wr0KMbsbV1Ry68zH99k=
github.com/mcandre/mage-extras v0.0.17 h1:Ihe4gfRYpn1Goowzk339YmYC1K9jXN2aJ9GaMUtiGDU=
github.com/mcandre/mage-extras v0.0.17/go.mod h1:OvwmvvrYj+Eb+8LCL8ScRMJ9wr0KMbsbV1Ry68zH99k=
10 changes: 7 additions & 3 deletions magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,19 @@ var artifactsPath = "bin"
// Default references the default build task.
var Default = Test

// Snyk runs a snyk security audit.
func Snyk() error { return mageextras.SnykTest() }
// Govulncheck runs govulncheck.
func Govulncheck() error { return mageextras.Govulncheck("./...") }

// SnykTest runs Snyk SCA.
func SnykTest() error { return mageextras.SnykTest() }

// DockerScout runs a Docker security audit.
func DockerScout() error { return mageextras.DockerScout("-e", "mcandre/tug-demo") }

// Audit runs security audits.
func Audit() error {
mg.Deps(mageextras.SnykTest)
mg.Deps(Govulncheck)
mg.Deps(SnykTest)
return DockerScout()
}

Expand Down
1 change: 1 addition & 0 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ all:
go install github.com/mcandre/factorio/cmd/[email protected]
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/[email protected]
go mod tidy

Expand Down
1 change: 1 addition & 0 deletions vendor/github.com/mcandre/mage-extras/.rubberstamp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions vendor/github.com/mcandre/mage-extras/govulncheck.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 10 additions & 3 deletions vendor/github.com/mcandre/mage-extras/magefile.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion vendor/github.com/mcandre/mage-extras/makefile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# github.com/magefile/mage v1.14.0
## explicit; go 1.12
github.com/magefile/mage/mg
# github.com/mcandre/mage-extras v0.0.16
# github.com/mcandre/mage-extras v0.0.17
## explicit; go 1.21
github.com/mcandre/mage-extras

0 comments on commit 2108a42

Please sign in to comment.