Skip to content

Commit 526d55b

Browse files
committed
versions: Update golang to 1.10.4
Move to golang version 1.10.4 -- the oldest stable golang release at the time of writing -- since golang 1.10+ is needed to make namespace handling safe. Re-ordered a couple of structs (moved `sync.WaitGroup` fields) to keep the `maligned` linter happy. Previously: `` virtcontainers/pkg/mock/cc_proxy_mock.go:24:18:warning: struct of size 160 could be 152 (maligned) virtcontainers/monitor.go:15:14:warning: struct of size 80 could be 72 (maligned) ``` See: - golang/go#20676 - golang/go@2595fe7 Also bumped `languages.golang.meta.newest-version` to golang version 1.11, which is the newest stable release at the time of writing. Fixes kata-containers#148. Signed-off-by: James O. D. Hunt <[email protected]>
1 parent 62992f5 commit 526d55b

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

versions.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,10 @@ languages:
186186
golang:
187187
description: "Google's 'go' language"
188188
notes: "'version' is the default minimum version used by this project."
189-
version: "1.9.7"
189+
issue: "https://github.com/golang/go/issues/20676"
190+
version: "1.10.4"
190191
meta:
191-
newest-version: "1.10"
192+
newest-version: "1.11"
192193

193194
specs:
194195
description: "Details of important specifications"

virtcontainers/monitor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ type monitor struct {
1818
sandbox *Sandbox
1919
checkInterval time.Duration
2020
watchers []chan error
21+
wg sync.WaitGroup
2122
running bool
2223
stopCh chan bool
23-
wg sync.WaitGroup
2424
}
2525

2626
func newMonitor(s *Sandbox) *monitor {

virtcontainers/pkg/mock/cc_proxy_mock.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ type CCProxyMock struct {
2525
sync.Mutex
2626

2727
t *testing.T
28-
wg sync.WaitGroup
2928
connectionPath string
3029

3130
// proxy socket
@@ -44,6 +43,8 @@ type CCProxyMock struct {
4443
ShimDisconnected chan bool
4544
StdinReceived chan bool
4645

46+
wg sync.WaitGroup
47+
4748
stopped bool
4849
}
4950

0 commit comments

Comments
 (0)