Skip to content

Commit

Permalink
Merge pull request #110 from stefanberger/stefanberger/abandon_go_1.18
Browse files Browse the repository at this point in the history
Abandon go 1.18 (end-of-life) and use 1.19 and 1.20 in tests
  • Loading branch information
stefanberger authored Mar 29, 2023
2 parents 92bd742 + 8fc037f commit d50cadb
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
tests:
strategy:
matrix:
go: [1.18, 1.19]
go: ["1.20", "1.19"]
os: [ubuntu-22.04, windows-2022]

name: Tests / ${{ matrix.os }} / ${{ matrix.go }}
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/containerd/imgcrypt

go 1.18
go 1.19

require (
github.com/Microsoft/go-winio v0.5.2
Expand Down
2 changes: 2 additions & 0 deletions script/tests/test_encryption.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ setup() {

startContainerd() {
cat <<_EOF_ >${CONFIG_TOML}
version = 2
disable_plugins = ["cri"]
root = "${ROOTDIR}"
state = "${STATEDIR}"
Expand Down Expand Up @@ -120,6 +121,7 @@ startContainerdLocalKeys() {
LOCAL_KEYS_PATH="${WORKDIR}/keys"
mkdir -p ${LOCAL_KEYS_PATH}
cat <<_EOF_ >${CONFIG_TOML}
version = 2
disable_plugins = ["cri"]
root = "${ROOTDIR}"
state = "${STATEDIR}"
Expand Down

0 comments on commit d50cadb

Please sign in to comment.