Skip to content

Commit 7e87bc0

Browse files
authored
chore: bump Go to 1.23.3 (#108)
1 parent 195a37a commit 7e87bc0

File tree

6 files changed

+20
-10
lines changed

6 files changed

+20
-10
lines changed

.github/workflows/ci.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ jobs:
3737
# Install Go!
3838
- uses: actions/setup-go@v3
3939
with:
40-
go-version: "~1.22"
40+
go-version: "~1.23"
4141

4242
# Check for Go linting errors!
4343
- name: Lint Go
44-
uses: golangci/golangci-lint-action@v6.0.1
44+
uses: golangci/golangci-lint-action@v6.1.1
4545
with:
46-
version: v1.59.1
46+
version: v1.62.2
4747
args: "--out-${NO_FUTURE}format colored-line-number"
4848

4949
- name: Lint shell scripts
@@ -98,7 +98,7 @@ jobs:
9898

9999
- uses: actions/setup-go@v3
100100
with:
101-
go-version: "~1.22"
101+
go-version: "~1.23"
102102

103103
# Sadly the new "set output" syntax (of writing env vars to
104104
# $GITHUB_OUTPUT) does not work on both powershell and bash so we use the
@@ -136,7 +136,7 @@ jobs:
136136

137137
- uses: actions/setup-go@v3
138138
with:
139-
go-version: "~1.22"
139+
go-version: "~1.23"
140140

141141
# Sadly the new "set output" syntax (of writing env vars to
142142
# $GITHUB_OUTPUT) does not work on both powershell and bash so we use the
@@ -170,7 +170,7 @@ jobs:
170170
- uses: actions/checkout@v3
171171
- uses: actions/setup-go@v3
172172
with:
173-
go-version: "~1.22"
173+
go-version: "~1.23"
174174

175175
- name: Go Cache Paths
176176
id: go-cache-paths
@@ -223,7 +223,7 @@ jobs:
223223
- name: Setup Go
224224
uses: actions/setup-go@v3
225225
with:
226-
go-version: "~1.22"
226+
go-version: "~1.23"
227227

228228
- name: Go Cache Paths
229229
id: go-cache-paths
@@ -257,7 +257,7 @@ jobs:
257257

258258
- uses: actions/setup-go@v3
259259
with:
260-
go-version: "~1.22"
260+
go-version: "~1.23"
261261

262262
- name: build image
263263
run: make -j build/image/envbox

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757

5858
- uses: actions/setup-go@v3
5959
with:
60-
go-version: "~1.22"
60+
go-version: "~1.23"
6161

6262
- name: Go Cache Paths
6363
id: go-cache-paths

cli/cliflag/cliflag_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,11 @@ func TestCliflag(t *testing.T) {
113113
flagset, name, shorthand, env, usage := randomFlag()
114114
def, _ := cryptorand.Intn(10)
115115

116+
//nolint:gosec
116117
cliflag.Uint8VarP(flagset, &ptr, name, shorthand, env, uint8(def), usage)
117118
got, err := flagset.GetUint8(name)
118119
require.NoError(t, err)
120+
//nolint:gosec
119121
require.Equal(t, uint8(def), got)
120122
require.Contains(t, flagset.FlagUsages(), usage)
121123
require.Contains(t, flagset.FlagUsages(), fmt.Sprintf("Consumes $%s", env))
@@ -125,12 +127,15 @@ func TestCliflag(t *testing.T) {
125127
var ptr uint8
126128
flagset, name, shorthand, env, usage := randomFlag()
127129
envValue, _ := cryptorand.Intn(10)
130+
//nolint:gosec
128131
t.Setenv(env, strconv.FormatUint(uint64(envValue), 10))
129132
def, _ := cryptorand.Intn(10)
130133

134+
//nolint:gosec
131135
cliflag.Uint8VarP(flagset, &ptr, name, shorthand, env, uint8(def), usage)
132136
got, err := flagset.GetUint8(name)
133137
require.NoError(t, err)
138+
//nolint:gosec
134139
require.Equal(t, uint8(envValue), got)
135140
})
136141

@@ -141,9 +146,11 @@ func TestCliflag(t *testing.T) {
141146
t.Setenv(env, envValue)
142147
def, _ := cryptorand.Intn(10)
143148

149+
//nolint:gosec
144150
cliflag.Uint8VarP(flagset, &ptr, name, shorthand, env, uint8(def), usage)
145151
got, err := flagset.GetUint8(name)
146152
require.NoError(t, err)
153+
//nolint:gosec
147154
require.Equal(t, uint8(def), got)
148155
})
149156

@@ -164,6 +171,7 @@ func TestCliflag(t *testing.T) {
164171
var ptr int
165172
flagset, name, shorthand, env, usage := randomFlag()
166173
envValue, _ := cryptorand.Intn(10)
174+
//nolint:gosec
167175
t.Setenv(env, strconv.FormatUint(uint64(envValue), 10))
168176
def, _ := cryptorand.Intn(10)
169177

dockerutil/network.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ func mustNextIPv4(ip net.IP, inc int) net.IP {
3636
v += uint32(ip4[1]) << 16
3737
v += uint32(ip4[2]) << 8
3838
v += uint32(ip4[3])
39+
//nolint:gosec
3940
v += uint32(inc)
4041
v3 := byte(v & 0xFF)
4142
v2 := byte((v >> 8) & 0xFF)

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/coder/envbox
22

3-
go 1.22.4
3+
go 1.23.3
44

55
// There are a few minor changes we make to Tailscale that we're slowly upstreaming. Compare here:
66
// https://github.com/tailscale/tailscale/compare/main...coder:tailscale:main

xunix/device.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ func createDevice(ctx context.Context, conf deviceConfig) error {
109109
return xerrors.Errorf("ensure parent dir: %w", err)
110110
}
111111

112+
//nolint:gosec
112113
err = fs.Mknod(conf.path, conf.ftype|conf.mode, int(conf.dev))
113114
if err != nil {
114115
return xerrors.Errorf("mknod %s c %d %d: %w", conf.path, conf.major, conf.minor, err)

0 commit comments

Comments
 (0)