Skip to content

Commit 544b070

Browse files
NoxsiosNoxsios
authored
chore(deps): upgrade to go 1.24 (#164)
## Description CI is currently stuck due to vulnerabilities in old dependencies + some needed `go mod tidy`. Checked Zarf (only importer this repo currently cares about) and it is on Go 1.24.x, so upgrading to Go 1.24.0 should not introduce any breaking changes. Evidence: - https://github.com/defenseunicorns/pkg/actions/runs/14523743979/job/40750505482?pr=160 - https://github.com/defenseunicorns/pkg/actions/runs/14523743975/job/40750506121?pr=160 --------- Signed-off-by: Harry Randazzo <[email protected]>
1 parent b578b7f commit 544b070

File tree

13 files changed

+434
-579
lines changed

13 files changed

+434
-579
lines changed

‎.github/actions/bump-and-notes/action.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ runs:
1818
steps:
1919
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
2020
with:
21-
go-version: 1.21.x
21+
go-version: 1.24.x
2222
cache-dependency-path: |
2323
internal/release/go.sum
2424
internal/release/go.mod

‎.github/actions/install-tools/action.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ runs:
1515

1616
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
1717
with:
18-
go-version: 1.21.x
18+
go-version: 1.24.x
1919
cache-dependency-path: |
2020
**/go.sum
2121
**/go.mod

‎exec/go.mod‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
module github.com/defenseunicorns/pkg/exec
22

3-
go 1.21.8
3+
go 1.24.0
44

5-
replace github.com/defenseunicorns/pkg/helpers => ../helpers
5+
replace github.com/defenseunicorns/pkg/helpers/v2 => ../helpers
66

77
require (
8-
github.com/defenseunicorns/pkg/helpers v1.1.1
9-
golang.org/x/sync v0.6.0
8+
github.com/defenseunicorns/pkg/helpers/v2 v2.0.1
9+
golang.org/x/sync v0.13.0
1010
)
1111

1212
require (
13-
github.com/otiai10/copy v1.14.0 // indirect
14-
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
13+
github.com/otiai10/copy v1.14.1 // indirect
14+
github.com/otiai10/mint v1.6.3 // indirect
15+
golang.org/x/sys v0.32.0 // indirect
1516
oras.land/oras-go/v2 v2.5.0 // indirect
1617
)

‎exec/go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
22
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3-
github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU=
4-
github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w=
5-
github.com/otiai10/mint v1.5.1 h1:XaPLeE+9vGbuyEHem1JNk3bYc7KKqyI/na0/mLd/Kks=
6-
github.com/otiai10/mint v1.5.1/go.mod h1:MJm72SBthJjz8qhefc4z1PYEieWmy8Bku7CjcAqyUSM=
3+
github.com/otiai10/copy v1.14.1 h1:5/7E6qsUMBaH5AnQ0sSLzzTg1oTECmcCmT6lvF45Na8=
4+
github.com/otiai10/copy v1.14.1/go.mod h1:oQwrEDDOci3IM8dJF0d8+jnbfPDllW6vUjNc3DoZm9I=
5+
github.com/otiai10/mint v1.6.3 h1:87qsV/aw1F5as1eH1zS/yqHY85ANKVMgkDrf9rcxbQs=
6+
github.com/otiai10/mint v1.6.3/go.mod h1:MJm72SBthJjz8qhefc4z1PYEieWmy8Bku7CjcAqyUSM=
77
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
88
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
9-
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
10-
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
11-
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
12-
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
13-
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
14-
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
9+
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
10+
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
11+
golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
12+
golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
13+
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
14+
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
1515
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
1616
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
1717
oras.land/oras-go/v2 v2.5.0 h1:o8Me9kLY74Vp5uw07QXPiitjsw7qNXi8Twd+19Zf02c=

‎exec/utils.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"strings"
1414
"sync"
1515

16-
"github.com/defenseunicorns/pkg/helpers"
16+
"github.com/defenseunicorns/pkg/helpers/v2"
1717
)
1818

1919
var supportedCmdMutations = []string{"zarf", "uds", "kubectl"}

‎helpers/go.mod‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
module github.com/defenseunicorns/pkg/helpers/v2
22

3-
go 1.21.8
3+
go 1.24.0
44

55
require (
6-
github.com/otiai10/copy v1.14.0
7-
github.com/stretchr/testify v1.9.0
6+
github.com/otiai10/copy v1.14.1
7+
github.com/stretchr/testify v1.10.0
88
oras.land/oras-go/v2 v2.5.0
99
)
1010

1111
require (
1212
github.com/davecgh/go-spew v1.1.1 // indirect
13+
github.com/otiai10/mint v1.6.3 // indirect
1314
github.com/pmezard/go-difflib v1.0.0 // indirect
14-
golang.org/x/sync v0.6.0 // indirect
15-
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
15+
golang.org/x/sync v0.13.0 // indirect
16+
golang.org/x/sys v0.32.0 // indirect
1617
gopkg.in/yaml.v3 v3.0.1 // indirect
1718
)

‎helpers/go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
22
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3-
github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU=
4-
github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w=
5-
github.com/otiai10/mint v1.5.1 h1:XaPLeE+9vGbuyEHem1JNk3bYc7KKqyI/na0/mLd/Kks=
6-
github.com/otiai10/mint v1.5.1/go.mod h1:MJm72SBthJjz8qhefc4z1PYEieWmy8Bku7CjcAqyUSM=
3+
github.com/otiai10/copy v1.14.1 h1:5/7E6qsUMBaH5AnQ0sSLzzTg1oTECmcCmT6lvF45Na8=
4+
github.com/otiai10/copy v1.14.1/go.mod h1:oQwrEDDOci3IM8dJF0d8+jnbfPDllW6vUjNc3DoZm9I=
5+
github.com/otiai10/mint v1.6.3 h1:87qsV/aw1F5as1eH1zS/yqHY85ANKVMgkDrf9rcxbQs=
6+
github.com/otiai10/mint v1.6.3/go.mod h1:MJm72SBthJjz8qhefc4z1PYEieWmy8Bku7CjcAqyUSM=
77
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
88
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
9-
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
10-
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
11-
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
12-
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
13-
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
14-
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
9+
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
10+
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
11+
golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
12+
golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
13+
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
14+
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
1515
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
1616
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
1717
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

‎internal/release/go.mod‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,35 @@
11
module github.com/defenseunicorns/pkg/internal/release
22

3-
go 1.21.8
3+
go 1.24.0
44

55
require (
66
github.com/Masterminds/semver v1.5.0
7-
github.com/go-git/go-billy/v5 v5.5.0
8-
github.com/go-git/go-git/v5 v5.11.0
9-
github.com/stretchr/testify v1.8.4
10-
golang.org/x/mod v0.16.0
7+
github.com/go-git/go-billy/v5 v5.6.2
8+
github.com/go-git/go-git/v5 v5.16.0
9+
github.com/stretchr/testify v1.10.0
10+
golang.org/x/mod v0.24.0
1111
)
1212

1313
require (
14-
dario.cat/mergo v1.0.0 // indirect
15-
github.com/Microsoft/go-winio v0.6.1 // indirect
16-
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
17-
github.com/cloudflare/circl v1.3.7 // indirect
18-
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
14+
dario.cat/mergo v1.0.1 // indirect
15+
github.com/Microsoft/go-winio v0.6.2 // indirect
16+
github.com/ProtonMail/go-crypto v1.2.0 // indirect
17+
github.com/cloudflare/circl v1.6.1 // indirect
18+
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
1919
github.com/davecgh/go-spew v1.1.1 // indirect
2020
github.com/emirpasic/gods v1.18.1 // indirect
2121
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
22-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
22+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
2323
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
2424
github.com/kevinburke/ssh_config v1.2.0 // indirect
25-
github.com/pjbgf/sha1cd v0.3.0 // indirect
25+
github.com/pjbgf/sha1cd v0.3.2 // indirect
2626
github.com/pmezard/go-difflib v1.0.0 // indirect
27-
github.com/sergi/go-diff v1.1.0 // indirect
28-
github.com/skeema/knownhosts v1.2.1 // indirect
27+
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
28+
github.com/skeema/knownhosts v1.3.1 // indirect
2929
github.com/xanzy/ssh-agent v0.3.3 // indirect
30-
golang.org/x/crypto v0.21.0 // indirect
31-
golang.org/x/net v0.23.0 // indirect
32-
golang.org/x/sys v0.18.0 // indirect
33-
golang.org/x/tools v0.13.0 // indirect
30+
golang.org/x/crypto v0.37.0 // indirect
31+
golang.org/x/net v0.39.0 // indirect
32+
golang.org/x/sys v0.32.0 // indirect
3433
gopkg.in/warnings.v0 v0.1.2 // indirect
3534
gopkg.in/yaml.v3 v3.0.1 // indirect
3635
)

0 commit comments

Comments
 (0)