merge branch 'pr-2769'

Kir Kolyshkin (2):
  ci: test with golang 1.16-rc1
  tests/int/spec.bats: fix for go 1.16

LGTMs: @AkihiroSuda @cyphar
Closes #2769
This commit is contained in:
Aleksa Sarai
2021-02-01 11:05:49 +11:00
2 changed files with 4 additions and 3 deletions
+2 -1
View File
@@ -19,7 +19,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go-version: [1.14.x, 1.15.x]
go-version: [1.14.x, 1.15.x, 1.16.0-rc1]
rootless: ["rootless", ""]
steps:
@@ -40,6 +40,7 @@ jobs:
- name: install go ${{ matrix.go-version }}
uses: actions/setup-go@v2
with:
stable: '!contains(${{ matrix.go-version }}, "beta") && !contains(${{ matrix.go-version }}, "rc")'
go-version: ${{ matrix.go-version }}
- name: build
+2 -2
View File
@@ -33,8 +33,8 @@ function teardown() {
SCHEMA='runtime-spec/schema/config-schema.json'
[ -e "$SCHEMA" ]
go get github.com/xeipuuv/gojsonschema
go build runtime-spec/schema/validate.go
GO111MODULE=auto go get github.com/xeipuuv/gojsonschema
GO111MODULE=auto go build runtime-spec/schema/validate.go
./validate "$SCHEMA" config.json
}