Skip to content

Commit 9c54c55

Browse files
AkihiroSudaAkihiroSuda
committed
Go 1.21
Signed-off-by: Akihiro Suda <[email protected]>
1 parent 148b686 commit 9c54c55

File tree

4 files changed

+38
-21
lines changed

4 files changed

+38
-21
lines changed

‎.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
fetch-depth: 1
3131
- uses: actions/setup-go@v4
3232
with:
33-
go-version: 1.20.x
33+
go-version: 1.21.x
3434
- name: Make darwin artifacts
3535
run: make artifacts-darwin
3636
- name: "Upload artifacts"
@@ -50,7 +50,7 @@ jobs:
5050
path: _artifacts/
5151
- uses: actions/setup-go@v4
5252
with:
53-
go-version: 1.20.x
53+
go-version: 1.21.x
5454
- name: Install gcc-aarch64-linux-gnu
5555
run: |
5656
sudo apt-get update

‎.github/workflows/test.yml

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ on:
88
pull_request:
99

1010
jobs:
11-
basic:
12-
name: "Lints & Unit tests"
11+
lints:
12+
name: "Lints"
1313
runs-on: ubuntu-22.04
1414
timeout-minutes: 30
1515
steps:
@@ -18,7 +18,7 @@ jobs:
1818
fetch-depth: 1
1919
- uses: actions/setup-go@v4
2020
with:
21-
go-version: 1.20.x
21+
go-version: 1.21.x
2222
- name: Run golangci-lint
2323
uses: golangci/[email protected]
2424
with:
@@ -40,6 +40,23 @@ jobs:
4040
uses: docker://dkhamsing/awesome_bot:latest
4141
with:
4242
args: /github/workspace/README.md --allow-dupe --allow-redirect --request-delay 1 --white-list https://img.shields.io,http://127.0.0.1:8080,https://github.com/lima-vm/lima/releases/download,https://xbarapp.com,https://api.github.com
43+
44+
unit:
45+
name: "Unit tests"
46+
runs-on: ubuntu-22.04
47+
timeout-minutes: 30
48+
strategy:
49+
fail-fast: false
50+
matrix:
51+
# For Linux we have to support an old release of Go
52+
go-version: ["1.20.x", "1.21.x"]
53+
steps:
54+
- uses: actions/checkout@v3
55+
with:
56+
fetch-depth: 1
57+
- uses: actions/setup-go@v4
58+
with:
59+
go-version: ${{ matrix.go-version }}
4360
- name: Unit tests
4461
run: go test -v ./...
4562
- name: Make
@@ -59,7 +76,7 @@ jobs:
5976
fetch-depth: 1
6077
- uses: actions/setup-go@v4
6178
with:
62-
go-version: 1.20.x
79+
go-version: 1.21.x
6380
- name: Unit tests
6481
run: go test -v ./...
6582
- name: Make
@@ -75,7 +92,7 @@ jobs:
7592
fetch-depth: 1
7693
- uses: actions/setup-go@v4
7794
with:
78-
go-version: 1.20.x
95+
go-version: 1.21.x
7996
- name: Cache ~/Library/Caches/lima/download
8097
uses: actions/cache@v3
8198
with:
@@ -242,7 +259,7 @@ jobs:
242259
fetch-depth: 1
243260
- uses: actions/setup-go@v4
244261
with:
245-
go-version: 1.20.x
262+
go-version: 1.21.x
246263
- name: Cache ~/Library/Caches/lima/download
247264
uses: actions/cache@v3
248265
with:
@@ -316,7 +333,7 @@ jobs:
316333
fetch-depth: 0
317334
- uses: actions/setup-go@v4
318335
with:
319-
go-version: 1.20.x
336+
go-version: 1.21.x
320337
- name: Cache ~/Library/Caches/lima/download
321338
uses: actions/cache@v3
322339
with:
@@ -342,7 +359,7 @@ jobs:
342359
fetch-depth: 1
343360
- uses: actions/setup-go@v4
344361
with:
345-
go-version: 1.20.x
362+
go-version: 1.21.x
346363
- name: Cache ~/Library/Caches/lima/download
347364
uses: actions/cache@v3
348365
with:

‎go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/lima-vm/lima
22

3-
go 1.19
3+
go 1.20
44

55
require (
66
github.com/AlecAivazis/survey/v2 v2.3.7
@@ -10,7 +10,7 @@ require (
1010
github.com/cheggaaa/pb/v3 v3.1.4
1111
github.com/containerd/containerd v1.7.3
1212
github.com/containerd/continuity v0.4.1
13-
github.com/containers/gvisor-tap-vsock v0.6.2
13+
github.com/containers/gvisor-tap-vsock v0.7.0
1414
github.com/coreos/go-semver v0.3.1
1515
github.com/cpuguy83/go-md2man/v2 v2.0.2
1616
github.com/cyphar/filepath-securejoin v0.2.3
@@ -110,7 +110,7 @@ require (
110110
golang.org/x/term v0.10.0 // indirect
111111
golang.org/x/text v0.11.0 // indirect
112112
golang.org/x/time v0.3.0 // indirect
113-
golang.org/x/tools v0.9.1 // indirect
113+
golang.org/x/tools v0.9.3 // indirect
114114
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
115115
google.golang.org/appengine v1.6.7 // indirect
116116
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
@@ -120,7 +120,7 @@ require (
120120
gopkg.in/inf.v0 v0.9.1 // indirect
121121
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
122122
gopkg.in/yaml.v2 v2.4.0 // indirect
123-
gvisor.dev/gvisor v0.0.0-20221216231429-a78e892a26d2 // indirect
123+
gvisor.dev/gvisor v0.0.0-20230715022000-fd277b20b8db // indirect
124124
k8s.io/klog/v2 v2.90.1 // indirect
125125
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
126126
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 // indirect

‎go.sum

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ github.com/containerd/containerd v1.7.3 h1:cKwYKkP1eTj54bP3wCdXXBymmKRQMrWjkLSWZ
3333
github.com/containerd/containerd v1.7.3/go.mod h1:32FOM4/O0RkNg7AjQj3hDzN9cUGtu+HMvaKUNiqCZB8=
3434
github.com/containerd/continuity v0.4.1 h1:wQnVrjIyQ8vhU2sgOiL5T07jo+ouqc2bnKsv5/EqGhU=
3535
github.com/containerd/continuity v0.4.1/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=
36-
github.com/containers/gvisor-tap-vsock v0.6.2 h1:wc/me5SXVlF2iOv5gjmjZARsJTggzpVoNO9dgC+2uRA=
37-
github.com/containers/gvisor-tap-vsock v0.6.2/go.mod h1:vyqP7jqNzPudoYhnvj3Dw2lhsjQ3kf1/PyXLEaZsvb0=
36+
github.com/containers/gvisor-tap-vsock v0.7.0 h1:lL5UpfXhl+tuTwK43CXhKWwfvAiZtde6G5alFeoO+Z8=
37+
github.com/containers/gvisor-tap-vsock v0.7.0/go.mod h1:edQTwl8ar+ACuQOkazpQkgd/ZMF6TJ2Xr3fv+MKUaw8=
3838
github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
3939
github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
4040
github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
@@ -235,7 +235,7 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
235235
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
236236
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
237237
github.com/onsi/ginkgo/v2 v2.4.0 h1:+Ig9nvqgS5OBSACXNk15PLdp0U9XPYROt9CFzVdFGIs=
238-
github.com/onsi/gomega v1.27.8 h1:gegWiwZjBsf2DgiSbf5hpokZ98JVDMcWkUiigk6/KXc=
238+
github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
239239
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
240240
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
241241
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0=
@@ -410,8 +410,8 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY
410410
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
411411
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
412412
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
413-
golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo=
414-
golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
413+
golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
414+
golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
415415
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
416416
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
417417
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -471,8 +471,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
471471
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
472472
gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY=
473473
gotest.tools/v3 v3.5.0/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
474-
gvisor.dev/gvisor v0.0.0-20221216231429-a78e892a26d2 h1:QN+Xh63jThYFN4CrcD4KXj+rUhevlb0LXEAlZ4m+qXQ=
475-
gvisor.dev/gvisor v0.0.0-20221216231429-a78e892a26d2/go.mod h1:Dn5idtptoW1dIos9U6A2rpebLs/MtTwFacjKb8jLdQA=
474+
gvisor.dev/gvisor v0.0.0-20230715022000-fd277b20b8db h1:WZSmkyu/hep9YhWIlBZefwGVBrnGE5yW8JPD56YRsXs=
475+
gvisor.dev/gvisor v0.0.0-20230715022000-fd277b20b8db/go.mod h1:sQuqOkxbfJq/GS2uSnqHphtXclHyk/ZrAGhZBxxsq6g=
476476
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
477477
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
478478
inet.af/tcpproxy v0.0.0-20221017015627-91f861402626 h1:2dMP3Ox/Wh5BiItwOt4jxRsfzkgyBrHzx2nW28Yg6nc=

0 commit comments

Comments
 (0)