Skip to content

Commit

Permalink
update go; update factorio; update mage-extras; drop golint
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew Pennebaker committed Dec 27, 2023
1 parent 866229c commit 3387741
Show file tree
Hide file tree
Showing 22 changed files with 55 additions and 98 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.20.2
golang 1.21.5
nodejs 16.14.2
rust 1.68.2
2 changes: 1 addition & 1 deletion DEVELOPMENT.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# BUILDTIME REQUIREMENTS

* [Go](https://golang.org/) 1.20.2+
* [Go](https://golang.org/) 1.21.5+
* [Node.js](https://nodejs.org/en) 16.14.2+
* [Docker](https://www.docker.com/) 20.10.12+
* [Rust](https://www.rust-lang.org/) 1.68.2+
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ FreeBSD

`tug -get-platforms` lists available platforms.

`tug -ls <name>` lists cached buildx entries, for the given image name (format `name[:tag]`).
`tug -ls <name>` lists cached buildx entries, for the given image name (format `name[:tag]`). Note that this lookup targets primarily remotely pushed images.

`tug -t <name>` builds multi-platform images with the given image name (format `name[:tag]`). This is the essential tug build command.

Expand All @@ -88,7 +88,7 @@ Notable options:
* `-exclude-os <list>` rejects image operating systems from builds. The list is comma delimited.
* `-exclude-arch <list>` rejects image architectures from builds. The list is comma delimited.
* `-load <os/arch>` copies an image of the given platform from the buildx cache to the local Docker registry as a side effect of the build. By default, multi-platform do not appear in the main local image cache. Mainly useful to prepare quick `docker run`... tests of `linux/amd64` platform images.
* `-push` uploads buildx cached images to the remote Docker registry, as a side effect of the build. Normally, multi-platform images cannot be pushed from the main local cache, because most platforms are do not support loading into the main local cache.
* `-push` uploads buildx cached images to the remote Docker registry, as a side effect of the build. Normally, multi-platform images cannot be pushed from the main local cache, because most platforms do not support loading into the main local cache.
* `.` or `<directory>` are optional trailing arguments for the Docker build directory. We default to the current working directory.

See `tug -help` for more options.
Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
module github.com/mcandre/tug

go 1.20
go 1.21

require (
github.com/magefile/mage v1.14.0
github.com/mcandre/mage-extras v0.0.12
github.com/mcandre/mage-extras v0.0.13
)

require (
github.com/jhoonb/archivex v0.0.0-20201016144719-6a343cdae81d // indirect
github.com/mcandre/factorio v0.0.3 // indirect
github.com/mcandre/factorio v0.0.4 // indirect
github.com/mcandre/zipc v0.0.7 // indirect
)
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ github.com/jhoonb/archivex v0.0.0-20201016144719-6a343cdae81d h1:q7n+5taxmM+9T2Q
github.com/jhoonb/archivex v0.0.0-20201016144719-6a343cdae81d/go.mod h1:GN1Mg/uXQ6qwXA0HypnUO3xlcQJS9/y68EsHNeuuRa4=
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/factorio v0.0.3 h1:Btvt75LUiqz9KR/bLPzQm1JkYYys8E7lBoA0PVjaTd4=
github.com/mcandre/factorio v0.0.3/go.mod h1:5bwnhNtdM7IyVMhwNHpbZdUgxX799lLM5LS6wwSEUng=
github.com/mcandre/mage-extras v0.0.12 h1:g8XslHjgZjKQbUU4QoGw194bmYGSVo1KHDGic3Bt2k8=
github.com/mcandre/mage-extras v0.0.12/go.mod h1:Q2tXIHq3wfVxrpucaR4mnXSXrAEpprzZwGR/WejfrJA=
github.com/mcandre/factorio v0.0.4 h1:oHNvUotxih45UioIihRLmrd4Jal9UoYciwHAhfNCkqc=
github.com/mcandre/factorio v0.0.4/go.mod h1:/VL0Pp9RPgwt1QbYzXbf6W/jiJb97Wc4+UzXR7J8XkI=
github.com/mcandre/mage-extras v0.0.13 h1:ZQIFTRCDtyYTYZQ2NGk+aDma+YE1jLCiSh9olBb+Qhs=
github.com/mcandre/mage-extras v0.0.13/go.mod h1:3Q2v5MUDhiNsOHQSjRDq+u3QzjH+0g3eiI7nWsBFCFA=
github.com/mcandre/zipc v0.0.7 h1:P5f4pB80jG0UFnn/C5Ex3gG2eilDAXtzgPmPXd+oUE8=
github.com/mcandre/zipc v0.0.7/go.mod h1:oSG7tdqkZKlcTwzTmE5QXXM8TBkO2xwVzsOabVJ00KU=
4 changes: 0 additions & 4 deletions magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ func Test() error {
// GoVet runs go vet with shadow checks enabled.
func GoVet() error { return mageextras.GoVetShadow() }

// GoLint runs golint.
func GoLint() error { return mageextras.GoLint() }

// Gofmt runs gofmt.
func GoFmt() error { return mageextras.GoFmt("-s", "-w") }

Expand All @@ -59,7 +56,6 @@ func Unmake() error { return mageextras.Unmake(".") }
// Lint runs the lint suite.
func Lint() error {
mg.Deps(GoVet)
mg.Deps(GoLint)
mg.Deps(GoFmt)
mg.Deps(GoImports)
mg.Deps(Errcheck)
Expand Down
3 changes: 1 addition & 2 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ all:
go install github.com/alexkohler/[email protected]
go install github.com/kisielk/[email protected]
go install github.com/magefile/[email protected]
go install github.com/mcandre/factorio/cmd/[email protected]
go install golang.org/x/lint/golint@latest
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 honnef.co/go/tools/cmd/[email protected]
Expand Down
3 changes: 2 additions & 1 deletion vendor/github.com/mcandre/factorio/.tool-versions

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

9 changes: 6 additions & 3 deletions vendor/github.com/mcandre/factorio/DEVELOPMENT.md

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

6 changes: 2 additions & 4 deletions vendor/github.com/mcandre/factorio/README.md

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

16 changes: 0 additions & 16 deletions vendor/github.com/mcandre/factorio/accio.yaml

This file was deleted.

10 changes: 5 additions & 5 deletions vendor/github.com/mcandre/factorio/magefile.go

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

17 changes: 17 additions & 0 deletions vendor/github.com/mcandre/factorio/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/github.com/mcandre/factorio/version.go

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

2 changes: 1 addition & 1 deletion vendor/github.com/mcandre/mage-extras/.tool-versions

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

4 changes: 2 additions & 2 deletions vendor/github.com/mcandre/mage-extras/DEVELOPMENT.md

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

2 changes: 0 additions & 2 deletions vendor/github.com/mcandre/mage-extras/README.md

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

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

This file was deleted.

8 changes: 1 addition & 7 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: 1 addition & 2 deletions 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/github.com/mcandre/mage-extras/version.go

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

8 changes: 4 additions & 4 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ github.com/jhoonb/archivex
# github.com/magefile/mage v1.14.0
## explicit; go 1.12
github.com/magefile/mage/mg
# github.com/mcandre/factorio v0.0.3
## explicit; go 1.20
# github.com/mcandre/factorio v0.0.4
## explicit; go 1.21
github.com/mcandre/factorio
# github.com/mcandre/mage-extras v0.0.12
## explicit; go 1.20
# github.com/mcandre/mage-extras v0.0.13
## explicit; go 1.21
github.com/mcandre/mage-extras
# github.com/mcandre/zipc v0.0.7
## explicit; go 1.20
Expand Down

0 comments on commit 3387741

Please sign in to comment.