Skip to content

Commit 0aebb19

Browse files
authored
all: upgrade to Go 1.22 (#1805)
1 parent 95d5c2b commit 0aebb19

File tree

5 files changed

+173
-178
lines changed

5 files changed

+173
-178
lines changed

devbox.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,15 @@
1212
},
1313
"shell": {
1414
"init_hook": [
15-
"test -z $FISH_VERSION && unset CGO_ENABLED GO111MODULE GOARCH GOFLAGS GOMOD GOOS GOROOT GOTOOLCHAIN GOWORK",
15+
// Remove Go environment variables that might've been inherited from the
16+
// user's environment and could affect the build.
17+
"test -z $FISH_VERSION && \\",
18+
"unset CGO_ENABLED GO111MODULE GOARCH GOFLAGS GOMOD GOOS GOROOT GOTOOLCHAIN GOWORK || \\",
19+
"set --erase CGO_ENABLED GO111MODULE GOARCH GOFLAGS GOMOD GOOS GOROOT GOTOOLCHAIN GOWORK",
1620
],
1721
"scripts": {
18-
"build":
19-
// Build devbox for the current platform
20-
"go build -o dist/devbox ./cmd/devbox",
22+
// Build devbox for the current platform
23+
"build": "go build -o dist/devbox ./cmd/devbox",
2124
"build-darwin-amd64": "GOOS=darwin GOARCH=amd64 go build -o dist/devbox-darwin-amd64 ./cmd/devbox",
2225
"build-darwin-arm64": "GOOS=darwin GOARCH=arm64 go build -o dist/devbox-darwin-arm64 ./cmd/devbox",
2326
"build-linux-amd64": "GOOS=linux GOARCH=amd64 go build -o dist/devbox-linux-amd64 ./cmd/devbox",
@@ -28,9 +31,8 @@
2831
"devbox run build-linux-amd64",
2932
"devbox run build-linux-arm64",
3033
],
31-
"code":
32-
// Open VSCode
33-
"code .",
34+
// Open VSCode
35+
"code": "code .",
3436
"lint": "golangci-lint run --timeout 5m && scripts/gofumpt.sh",
3537
"fmt": "scripts/gofumpt.sh",
3638
"test": "go test -race -cover ./...",

devbox.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,32 @@
22
"lockfile_version": "1",
33
"packages": {
44
"go@latest": {
5-
"last_modified": "2023-11-17T14:14:56Z",
6-
"resolved": "github:NixOS/nixpkgs/a71323f68d4377d12c04a5410e214495ec598d4c#go",
5+
"last_modified": "2024-02-08T11:55:47Z",
6+
"resolved": "github:NixOS/nixpkgs/c0b7a892fb042ede583bdaecbbdc804acb85eabe#go_1_22",
77
"source": "devbox-search",
8-
"version": "1.21.4",
8+
"version": "1.22.0",
99
"systems": {
1010
"aarch64-darwin": {
11-
"store_path": "/nix/store/02cpvad60np366kmsqc3gnixbsw9jvg1-go-1.21.4"
11+
"store_path": "/nix/store/2022s0jnrn2iyxjaikfy51w5fvifp38b-go-1.22.0"
1212
},
1313
"aarch64-linux": {
14-
"store_path": "/nix/store/7y75b2ac80chlh6knld3943y46n3v9kf-go-1.21.4"
14+
"store_path": "/nix/store/7wxzkvjv8qc2awhagpz0r8q9ay38q3wj-go-1.22.0"
1515
},
1616
"x86_64-darwin": {
17-
"store_path": "/nix/store/0djljz0g4s6f55xcnw7fpzcy7af7rxid-go-1.21.4"
17+
"store_path": "/nix/store/fgkl3qk8p5hnd07b0dhzfky3ys5gxjmq-go-1.22.0"
1818
},
1919
"x86_64-linux": {
20-
"store_path": "/nix/store/y7abhs9glxfcg7lgcdc8i4ml5wg5ly92-go-1.21.4"
20+
"store_path": "/nix/store/88y9r33p3j8f7bc8sqiy9jdlk7yqfrlg-go-1.22.0"
2121
}
2222
}
2323
},
2424
"runx:golangci/golangci-lint@latest": {
25-
"resolved": "golangci/golangci-lint@v1.55.2",
26-
"version": "v1.55.2"
25+
"resolved": "golangci/golangci-lint@v1.56.1",
26+
"version": "v1.56.1"
2727
},
2828
"runx:mvdan/gofumpt@latest": {
29-
"resolved": "mvdan/gofumpt@v0.5.0",
30-
"version": "v0.5.0"
29+
"resolved": "mvdan/gofumpt@v0.6.0",
30+
"version": "v0.6.0"
3131
}
3232
}
3333
}

go.mod

Lines changed: 42 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
module go.jetpack.io/devbox
22

3-
go 1.21
3+
go 1.22.0
44

55
require (
66
github.com/AlecAivazis/survey/v2 v2.3.7
77
github.com/MakeNowJust/heredoc/v2 v2.0.1
88
github.com/alessio/shellescape v1.4.2
99
github.com/aws/aws-sdk-go-v2 v1.24.1
10-
github.com/aws/aws-sdk-go-v2/config v1.26.3
11-
github.com/aws/aws-sdk-go-v2/credentials v1.16.14
12-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.87
13-
github.com/aws/aws-sdk-go-v2/service/s3 v1.40.0
10+
github.com/aws/aws-sdk-go-v2/config v1.26.6
11+
github.com/aws/aws-sdk-go-v2/credentials v1.16.16
12+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.15
13+
github.com/aws/aws-sdk-go-v2/service/s3 v1.48.1
1414
github.com/aws/aws-sdk-go-v2/service/sts v1.26.7
15-
github.com/bmatcuk/doublestar/v4 v4.6.0
15+
github.com/bmatcuk/doublestar/v4 v4.6.1
1616
github.com/briandowns/spinner v1.23.0
1717
github.com/cavaliergopher/grab/v3 v3.0.1
1818
github.com/cloudflare/ahocorasick v0.0.0-20210425175752-730270c3e184
1919
github.com/creekorful/mvnparser v1.5.0
2020
github.com/denisbrodbeck/machineid v1.0.1
2121
github.com/f1bonacc1/process-compose v0.43.1
22-
github.com/fatih/color v1.15.0
23-
github.com/fsnotify/fsnotify v1.6.0
24-
github.com/getsentry/sentry-go v0.24.1
25-
github.com/google/go-cmp v0.5.9
26-
github.com/google/uuid v1.3.1
22+
github.com/fatih/color v1.16.0
23+
github.com/fsnotify/fsnotify v1.7.0
24+
github.com/getsentry/sentry-go v0.27.0
25+
github.com/google/go-cmp v0.6.0
26+
github.com/google/uuid v1.6.0
2727
github.com/hashicorp/go-envparse v0.1.0
2828
github.com/joho/godotenv v1.5.1
2929
github.com/mattn/go-isatty v0.0.20
3030
github.com/mholt/archiver/v4 v4.0.0-alpha.8
31-
github.com/pelletier/go-toml/v2 v2.1.0
31+
github.com/pelletier/go-toml/v2 v2.1.1
3232
github.com/pkg/errors v0.9.1
33-
github.com/rogpeppe/go-internal v1.11.0
33+
github.com/rogpeppe/go-internal v1.12.0
3434
github.com/samber/lo v1.39.0
3535
github.com/segmentio/analytics-go v3.1.0+incompatible
3636
github.com/spf13/cobra v1.8.0
@@ -41,45 +41,44 @@ require (
4141
github.com/zealic/go2node v0.1.0
4242
go.jetpack.io/envsec v0.0.16-0.20240111222345-e1fd0e1204ca
4343
go.jetpack.io/pkg v0.0.0-20240108193620-a28b84329d15
44-
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc
45-
golang.org/x/mod v0.14.0
46-
golang.org/x/sync v0.5.0
47-
golang.org/x/tools v0.16.0
44+
golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3
45+
golang.org/x/mod v0.15.0
46+
golang.org/x/sync v0.6.0
47+
golang.org/x/tools v0.17.0
4848
gopkg.in/natefinch/lumberjack.v2 v2.2.1
4949
gopkg.in/yaml.v3 v3.0.1
5050
)
5151

5252
require (
5353
connectrpc.com/connect v1.14.0 // indirect
54-
github.com/InVisionApp/go-health/v2 v2.1.3 // indirect
54+
github.com/InVisionApp/go-health/v2 v2.1.4 // indirect
5555
github.com/InVisionApp/go-logger v1.0.1 // indirect
56-
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
57-
github.com/andybalholm/brotli v1.0.5 // indirect
58-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.13 // indirect
56+
github.com/ProtonMail/go-crypto v1.0.0 // indirect
57+
github.com/andybalholm/brotli v1.1.0 // indirect
58+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4 // indirect
5959
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11 // indirect
6060
github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10 // indirect
6161
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10 // indirect
62-
github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2 // indirect
63-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.1.4 // indirect
62+
github.com/aws/aws-sdk-go-v2/internal/ini v1.7.3 // indirect
63+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.10 // indirect
6464
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 // indirect
65-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.36 // indirect
65+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.10 // indirect
6666
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10 // indirect
67-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.15.4 // indirect
68-
github.com/aws/aws-sdk-go-v2/service/sso v1.18.6 // indirect
69-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.6 // indirect
67+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.10 // indirect
68+
github.com/aws/aws-sdk-go-v2/service/sso v1.18.7 // indirect
69+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.7 // indirect
7070
github.com/aws/smithy-go v1.19.0 // indirect
7171
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
7272
github.com/bahlo/generic-list-go v0.2.0 // indirect
7373
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
74-
github.com/bodgit/plumbing v1.2.0 // indirect
75-
github.com/bodgit/sevenzip v1.3.0 // indirect
76-
github.com/bodgit/windows v1.0.0 // indirect
74+
github.com/bodgit/plumbing v1.3.0 // indirect
75+
github.com/bodgit/sevenzip v1.5.0 // indirect
76+
github.com/bodgit/windows v1.0.1 // indirect
7777
github.com/buger/jsonparser v1.1.1 // indirect
7878
github.com/charmbracelet/lipgloss v0.9.1 // indirect
7979
github.com/cloudflare/circl v1.3.7 // indirect
8080
github.com/codeclysm/extract/v3 v3.1.1 // indirect
81-
github.com/connesc/cipherio v0.2.1 // indirect
82-
github.com/coreos/go-oidc/v3 v3.7.0 // indirect
81+
github.com/coreos/go-oidc/v3 v3.9.0 // indirect
8382
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
8483
github.com/davecgh/go-spew v1.1.1 // indirect
8584
github.com/dsnet/compress v0.0.1 // indirect
@@ -101,8 +100,8 @@ require (
101100
github.com/jmespath/go-jmespath v0.4.0 // indirect
102101
github.com/juju/errors v1.0.0 // indirect
103102
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
104-
github.com/klauspost/compress v1.16.0 // indirect
105-
github.com/klauspost/pgzip v1.2.5 // indirect
103+
github.com/klauspost/compress v1.17.6 // indirect
104+
github.com/klauspost/pgzip v1.2.6 // indirect
106105
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
107106
github.com/mailru/easyjson v0.7.7 // indirect
108107
github.com/mattn/go-colorable v0.1.13 // indirect
@@ -113,22 +112,22 @@ require (
113112
github.com/nwaples/rardecode/v2 v2.0.0-beta.2 // indirect
114113
github.com/olekukonko/tablewriter v0.0.5 // indirect
115114
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
116-
github.com/pierrec/lz4/v4 v4.1.15 // indirect
117-
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
115+
github.com/pierrec/lz4/v4 v4.1.21 // indirect
116+
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
118117
github.com/pmezard/go-difflib v1.0.0 // indirect
119-
github.com/rivo/uniseg v0.4.4 // indirect
120-
github.com/rs/zerolog v1.29.0 // indirect
118+
github.com/rivo/uniseg v0.4.7 // indirect
119+
github.com/rs/zerolog v1.32.0 // indirect
121120
github.com/russross/blackfriday/v2 v2.1.0 // indirect
122121
github.com/segmentio/backo-go v1.0.1 // indirect
123122
github.com/therootcompany/xz v1.0.1 // indirect
124123
github.com/ulikunitz/xz v0.5.11 // indirect
125124
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
126125
go.jetpack.io/typeid v1.0.0 // indirect
127-
go4.org v0.0.0-20200411211856-f5505b9728dd // indirect
128-
golang.org/x/crypto v0.17.0 // indirect
129-
golang.org/x/oauth2 v0.15.0 // indirect
130-
golang.org/x/sys v0.15.0 // indirect
131-
golang.org/x/term v0.15.0 // indirect
126+
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
127+
golang.org/x/crypto v0.19.0 // indirect
128+
golang.org/x/oauth2 v0.17.0 // indirect
129+
golang.org/x/sys v0.17.0 // indirect
130+
golang.org/x/term v0.17.0 // indirect
132131
golang.org/x/text v0.14.0 // indirect
133132
google.golang.org/appengine v1.6.8 // indirect
134133
google.golang.org/protobuf v1.32.0 // indirect

0 commit comments

Comments
 (0)