Merge pull request #3326 from kolyshkin/go118beta

ci: add go 1.18beta1
opencontainers · Jan 26, 2022 · 403cda1 · 403cda1
2 parents a1727ef + b5cb405
commit 403cda1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -21,7 +21,7 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- go-version: [1.16.x, 1.17.x]
+ go-version: [1.16.x, 1.17.x, 1.18.0-beta1]
  rootless: ["rootless", ""]
  race: ["-race", ""]
  criu: [""]

diff --git a/libcontainer/factory_linux.go b/libcontainer/factory_linux.go
@@ -335,7 +335,12 @@ func (l *LinuxFactory) StartInitialization() (err error) {
 
  defer func() {
  if e := recover(); e != nil {
- err = fmt.Errorf("panic from initialization: %w, %v", e, string(debug.Stack()))
+ if e, ok := e.(error); ok {
+ err = fmt.Errorf("panic from initialization: %w, %s", e, debug.Stack())
+ } else {
+ //nolint:errorlint // here e is not of error type
+ err = fmt.Errorf("panic from initialization: %v, %s", e, debug.Stack())
+ }
  }
  }()