Skip to content

Commit

Permalink
Go 1.17 is the minimum version in all cases (#1337)
Browse files Browse the repository at this point in the history
This ensures:
- CI explicitly requires Go 1.17
- README specifies Go 1.17
- Tests also depend on Go 1.17

The go.mod already specifies 1.17 as the minimum Go version, so this
shouldn't be a difference in practice.

GitHub Actions setup-go was installing Go 1.17 already, presumably
honouring the value in go.mod.

One interesting change is that in 1.17, go.mod lists indirect
dependencies, and vendoring does not capture go.mod/go.sum, so the
test/vendor directory got slightly less noisy.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
  • Loading branch information
TBBle authored Mar 28, 2022
1 parent 93505d7 commit 6dd7225
Show file tree
Hide file tree
Showing 38 changed files with 92 additions and 2,356 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '^1.15.0'
go-version: '^1.17.0'

- name: golangci-lint
uses: golangci/golangci-lint-action@v2
Expand All @@ -31,7 +31,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '^1.15.0'
go-version: '^1.17.0'
- name: Validate main modules
shell: powershell
run: |
Expand All @@ -50,7 +50,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '^1.15.0'
go-version: '^1.17.0'
- name: Validate test modules
shell: powershell
run: |
Expand All @@ -70,7 +70,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '^1.15.0'
go-version: '^1.17.0'

- run: go test -gcflags=all=-d=checkptr -v ./... -tags admin
- run: go test -gcflags=all=-d=checkptr -v ./internal -tags admin
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '^1.15.0'
go-version: '^1.17.0'

- run: go build ./cmd/containerd-shim-runhcs-v1
- run: go build ./cmd/runhcs
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
- name: Install go
uses: actions/setup-go@v2
with:
go-version: '^1.15.0'
go-version: '^1.17.0'

- name: Pull busybox image
run: docker pull busybox
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additio

## Dependencies

This project requires Golang 1.13 or newer to build.
This project requires Golang 1.17 or newer to build.

For system requirements to run this project, see the Microsoft docs on [Windows Container requirements](https://docs.microsoft.com/en-us/virtualization/windowscontainers/deploy-containers/system-requirements).

Expand Down
39 changes: 38 additions & 1 deletion test/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/Microsoft/hcsshim/test

go 1.16
go 1.17

require (
github.com/Microsoft/go-winio v0.4.17
Expand All @@ -22,6 +22,43 @@ require (
k8s.io/cri-api v0.20.6
)

require (
github.com/bits-and-blooms/bitset v1.2.0 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/cenkalti/backoff/v4 v4.1.1 // indirect
github.com/containerd/cgroups v1.0.1 // indirect
github.com/containerd/console v1.0.2 // indirect
github.com/containerd/continuity v0.1.0 // indirect
github.com/containerd/fifo v1.0.0 // indirect
github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017 // indirect
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7 // indirect
github.com/docker/docker-credential-helpers v0.6.3 // indirect
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
github.com/gogo/googleapis v1.4.0 // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/golang/protobuf v1.5.0 // indirect
github.com/google/go-cmp v0.5.6 // indirect
github.com/google/go-containerregistry v0.5.1 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/go-multierror v1.0.0 // indirect
github.com/klauspost/compress v1.11.13 // indirect
github.com/moby/locker v1.0.1 // indirect
github.com/moby/sys/mountinfo v0.4.1 // indirect
github.com/opencontainers/runc v1.0.3 // indirect
github.com/opencontainers/selinux v1.8.2 // indirect
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f // indirect
go.opencensus.io v0.22.3 // indirect
golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
golang.org/x/text v0.3.6 // indirect
google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
google.golang.org/protobuf v1.27.1 // indirect
)

replace (
github.com/Microsoft/hcsshim => ../
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63
Expand Down
9 changes: 0 additions & 9 deletions test/vendor/github.com/Microsoft/go-winio/go.mod

This file was deleted.

14 changes: 0 additions & 14 deletions test/vendor/github.com/Microsoft/go-winio/go.sum

This file was deleted.

2 changes: 1 addition & 1 deletion test/vendor/github.com/Microsoft/hcsshim/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

62 changes: 0 additions & 62 deletions test/vendor/github.com/Microsoft/hcsshim/go.mod

This file was deleted.

Loading

0 comments on commit 6dd7225

Please sign in to comment.