Skip to content

Commit b2167ee

Browse files
committed
update go; update go dependencies; fix rust provisioning; update rust
1 parent f2691cc commit b2167ee

File tree

139 files changed

+3638
-1200
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+3638
-1200
lines changed

.github/workflows/audit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- uses: "actions/checkout@v4"
1616
- uses: "actions/setup-go@v5"
1717
with:
18-
go-version: "1.24.1"
18+
go-version: "1.24.2"
1919
- name: "provision go tools"
2020
run: "make go"
2121
- name: "install snyk"

.github/workflows/lint.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ jobs:
1111
- uses: "actions/checkout@v4"
1212
- uses: "actions/setup-go@v5"
1313
with:
14-
go-version: "1.24.1"
14+
go-version: "1.24.2"
15+
- uses: "dtolnay/rust-toolchain@stable"
16+
with:
17+
toolchain: "1.86.0"
1518
- name: "provision dev tools"
1619
run: "make -j 4"
1720
- run: "mage lint"

.github/workflows/test-crosscompile.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- uses: "actions/checkout@v4"
1212
- uses: "actions/setup-go@v5"
1313
with:
14-
go-version: "1.24.1"
14+
go-version: "1.24.2"
1515
- name: "provision go tools"
1616
run: "make go"
1717
- run: "mage port"
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
name: "Test-Futureproof-Dependencies"
3+
on: # yamllint disable-line rule:truthy
4+
push:
5+
pull_request:
6+
# POSIX cron format
7+
# https://pubs.opengroup.org/onlinepubs/9699919799/utilities/crontab.html
8+
schedule:
9+
# Once every 5 minutes
10+
# - cron: "*/5 * * * *"
11+
# Once a day
12+
- cron: "0 0 * * *"
13+
workflow_dispatch:
14+
jobs:
15+
Test-Futureproof-Dependencies:
16+
runs-on: "ubuntu-24.04"
17+
steps:
18+
- uses: "actions/checkout@v4"
19+
- uses: "actions/setup-go@v5"
20+
with:
21+
go-version: "1.24.2"
22+
- run: |
23+
go get -u all
24+
sh -c "go mod download && go mod vendor && go mod tidy" || echo 'go mod is silly'
25+
sh -c "go mod download && go mod vendor && go mod tidy"
26+
go test

.github/workflows/test-futureproof-os.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: "actions/checkout@v4"
1919
- uses: "actions/setup-go@v5"
2020
with:
21-
go-version: "1.24.1"
21+
go-version: "1.24.2"
2222
- name: "provision go tools"
2323
run: "make go"
2424
- run: "mage test"

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- uses: "actions/checkout@v4"
1212
- uses: "actions/setup-go@v5"
1313
with:
14-
go-version: "1.24.1"
14+
go-version: "1.24.2"
1515
- name: "provision go tools"
1616
run: "make go"
1717
- run: "mage test"

.tool-versions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
golang 1.24.1
2-
rust 1.75.0
1+
golang 1.24.2
2+
rust 1.86.0

DEVELOPMENT.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# BUILDTIME REQUIREMENTS
22

33
* [Docker](https://www.docker.com/) 20.10.12+
4-
* [Go](https://go.dev/) 1.24.1+
4+
* [Go](https://go.dev/) 1.24.2+
55
* [POSIX](https://pubs.opengroup.org/onlinepubs/9799919799/) compatible [make](https://en.wikipedia.org/wiki/Make_(software))
6-
* [Rust](https://www.rust-lang.org/) 1.75.0+
6+
* [Rust](https://www.rust-lang.org/) 1.86.0+
77
* [Snyk](https://snyk.io/)
88
* [POSIX](https://pubs.opengroup.org/onlinepubs/9799919799/) compatible [tar](https://en.wikipedia.org/wiki/Tar_(computing))
99
* Provision additional dev tools with `make [-j 4]`

go.mod

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/mcandre/tug
22

3-
go 1.24
3+
go 1.24.2
44

55
tool (
66
github.com/alexkohler/nakedret/v2/cmd/nakedret
@@ -13,12 +13,12 @@ tool (
1313

1414
require (
1515
github.com/magefile/mage v1.15.0
16-
github.com/mcandre/mage-extras v0.0.21
16+
github.com/mcandre/mage-extras v0.0.24
1717
)
1818

1919
require (
20-
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
21-
github.com/alexkohler/nakedret/v2 v2.0.5 // indirect
20+
github.com/BurntSushi/toml v1.5.0 // indirect
21+
github.com/alexkohler/nakedret/v2 v2.0.6 // indirect
2222
github.com/chavacava/garif v0.1.0 // indirect
2323
github.com/fatih/color v1.18.0 // indirect
2424
github.com/fatih/structtag v1.2.0 // indirect
@@ -27,20 +27,17 @@ require (
2727
github.com/mattn/go-colorable v0.1.14 // indirect
2828
github.com/mattn/go-isatty v0.0.20 // indirect
2929
github.com/mattn/go-runewidth v0.0.16 // indirect
30-
github.com/mcandre/factorio v0.0.10 // indirect
30+
github.com/mcandre/factorio v0.0.11 // indirect
3131
github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517 // indirect
32-
github.com/mgechev/revive v1.7.0 // indirect
32+
github.com/mgechev/revive v1.9.0 // indirect
3333
github.com/olekukonko/tablewriter v0.0.5 // indirect
3434
github.com/rivo/uniseg v0.4.7 // indirect
35-
github.com/spf13/afero v1.12.0 // indirect
36-
golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678 // indirect
37-
golang.org/x/mod v0.23.0 // indirect
38-
golang.org/x/sync v0.11.0 // indirect
39-
golang.org/x/sys v0.30.0 // indirect
40-
golang.org/x/text v0.22.0 // indirect
41-
golang.org/x/tools v0.30.0 // indirect
42-
honnef.co/go/tools v0.6.0 // indirect
35+
github.com/spf13/afero v1.14.0 // indirect
36+
golang.org/x/exp/typeparams v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
37+
golang.org/x/mod v0.24.0 // indirect
38+
golang.org/x/sync v0.13.0 // indirect
39+
golang.org/x/sys v0.32.0 // indirect
40+
golang.org/x/text v0.24.0 // indirect
41+
golang.org/x/tools v0.32.0 // indirect
42+
honnef.co/go/tools v0.6.1 // indirect
4343
)
44-
45-
// Pending https://github.com/alexkohler/nakedret/issues/38
46-
replace github.com/alexkohler/nakedret/v2 v2.0.5 => github.com/aep-sunlife/nakedret/v2 v2.0.0-20250227175454-3fb3a0f5caba

go.sum

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c h1:pxW6RcqyfI9/kWtOwnv/G+AzdKuy2ZrqINhenH4HyNs=
2-
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
3-
github.com/aep-sunlife/nakedret/v2 v2.0.0-20250227175454-3fb3a0f5caba h1:DHD1HF+X7LenY6aE7Ui5nZ58ZpLghNc3ukeT7YPDIiw=
4-
github.com/aep-sunlife/nakedret/v2 v2.0.0-20250227175454-3fb3a0f5caba/go.mod h1:lHm3fQdYT40PyAbaUD3u1axfcpgNQ85RseiTjwAmz9A=
1+
github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
2+
github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
3+
github.com/alexkohler/nakedret/v2 v2.0.6 h1:ME3Qef1/KIKr3kWX3nti3hhgNxw6aqN5pZmQiFSsuzQ=
4+
github.com/alexkohler/nakedret/v2 v2.0.6/go.mod h1:l3RKju/IzOMQHmsEvXwkqMDzHHvurNQfAgE1eVmT40Q=
55
github.com/chavacava/garif v0.1.0 h1:2JHa3hbYf5D9dsgseMKAmc/MZ109otzgNFk5s87H9Pc=
66
github.com/chavacava/garif v0.1.0/go.mod h1:XMyYCkEL58DF0oyW4qDjjnPWONs2HBqYKI+UIPD+Gww=
77
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -26,23 +26,23 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D
2626
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
2727
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
2828
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
29-
github.com/mcandre/factorio v0.0.10 h1:e/ZmsIK2uAPWLtYNeYnudwTv0Cvg58Dics+xz3EBnuI=
30-
github.com/mcandre/factorio v0.0.10/go.mod h1:GpRkIBedSDkICcy7N53SkkGAuud64PC+5gDcxSdH10I=
31-
github.com/mcandre/mage-extras v0.0.21 h1:Kif/BsdkQKCIQTmwseYC+TmZLxgjOf+1zJgKctmgNoA=
32-
github.com/mcandre/mage-extras v0.0.21/go.mod h1:zr+/cO9v8EtPmjHMVYx7ijYrbT3tfJSNgXc9ze6LJ4s=
29+
github.com/mcandre/factorio v0.0.11 h1:Nj7UhG5FNeUwx2QH/6dBR7k9FwiAo9NUMyflMT5vxUE=
30+
github.com/mcandre/factorio v0.0.11/go.mod h1:7Dqn51prkR4XTOpCF4qP1bNsZqU9lEasoh7bXp2QPgw=
31+
github.com/mcandre/mage-extras v0.0.24 h1:r0sStsVbiPRlKcdOi/nm3PUzYWKW1ImJhamaETYybno=
32+
github.com/mcandre/mage-extras v0.0.24/go.mod h1:zhbIqQ1YJruJ41ESXxc4Fb8rrLG/zE5MYBQkPPpopd8=
3333
github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517 h1:zpIH83+oKzcpryru8ceC6BxnoG8TBrhgAvRg8obzup0=
3434
github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517/go.mod h1:KQ7+USdGKfpPjXk4Ga+5XxQM4Lm4e3gAogrreFAYpOg=
35-
github.com/mgechev/revive v1.7.0 h1:JyeQ4yO5K8aZhIKf5rec56u0376h8AlKNQEmjfkjKlY=
36-
github.com/mgechev/revive v1.7.0/go.mod h1:qZnwcNhoguE58dfi96IJeSTPeZQejNeoMQLUZGi4SW4=
35+
github.com/mgechev/revive v1.9.0 h1:8LaA62XIKrb8lM6VsBSQ92slt/o92z5+hTw3CmrvSrM=
36+
github.com/mgechev/revive v1.9.0/go.mod h1:LAPq3+MgOf7GcL5PlWIkHb0PT7XH4NuC2LdWymhb9Mo=
3737
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
3838
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
3939
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
4040
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
4141
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
4242
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
4343
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
44-
github.com/spf13/afero v1.12.0 h1:UcOPyRBYczmFn6yvphxkn9ZEOY65cpwGKb5mL36mrqs=
45-
github.com/spf13/afero v1.12.0/go.mod h1:ZTlWwG4/ahT8W7T0WQ5uYmjI9duaLQGy3Q2OAl4sk/4=
44+
github.com/spf13/afero v1.14.0 h1:9tH6MapGnn/j0eb0yIXiLjERO8RB6xIVZRDCX7PtqWA=
45+
github.com/spf13/afero v1.14.0/go.mod h1:acJQ8t0ohCGuMN3O+Pv0V0hgMxNYDlvdk+VTfyZmbYo=
4646
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
4747
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
4848
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
@@ -51,22 +51,22 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
5151
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
5252
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
5353
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
54-
golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678 h1:1P7xPZEwZMoBoz0Yze5Nx2/4pxj6nw9ZqHWXqP0iRgQ=
55-
golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
56-
golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
57-
golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
58-
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
59-
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
54+
golang.org/x/exp/typeparams v0.0.0-20250408133849-7e4ce0ab07d0 h1:oMe07YcizemJ09rs2kRkFYAp0pt4e1lYLwPWiEGMpXE=
55+
golang.org/x/exp/typeparams v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:LKZHyeOpPuZcMgxeHjJp4p5yvxrCX1xDvH10zYHhjjQ=
56+
golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
57+
golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
58+
golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
59+
golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
6060
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
61-
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
62-
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
63-
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
64-
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
65-
golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
66-
golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=
61+
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
62+
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
63+
golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
64+
golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
65+
golang.org/x/tools v0.32.0 h1:Q7N1vhpkQv7ybVzLFtTjvQya2ewbwNDZzUgfXGqtMWU=
66+
golang.org/x/tools v0.32.0/go.mod h1:ZxrU41P/wAbZD8EDa6dDCa6XfpkhJ7HFMjHJXfBDu8s=
6767
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
6868
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
6969
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
7070
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
71-
honnef.co/go/tools v0.6.0 h1:TAODvD3knlq75WCp2nyGJtT4LeRV/o7NN9nYPeVJXf8=
72-
honnef.co/go/tools v0.6.0/go.mod h1:3puzxxljPCe8RGJX7BIy1plGbxEOZni5mR2aXe3/uk4=
71+
honnef.co/go/tools v0.6.1 h1:R094WgE8K4JirYjBaOpz/AvTyUu/3wbmAoskKN/pxTI=
72+
honnef.co/go/tools v0.6.1/go.mod h1:3puzxxljPCe8RGJX7BIy1plGbxEOZni5mR2aXe3/uk4=

0 commit comments

Comments
 (0)