Skip to content

Commit

Permalink
Merge pull request containerd#6716 from thaJeztah/1.5_remove_empty_mod
Browse files Browse the repository at this point in the history
[release/1.5] remove empty go mod to allow building for go 1.18
  • Loading branch information
dmcgowan authored Mar 23, 2022
2 parents a7c9377 + a2d10ac commit 09920a0
Show file tree
Hide file tree
Showing 6 changed files with 208 additions and 24 deletions.
11 changes: 0 additions & 11 deletions .empty-mod/go.mod

This file was deleted.

4 changes: 0 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ require (
github.com/pelletier/go-toml v1.8.1
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.7.1
github.com/satori/go.uuid v1.2.0 // indirect
github.com/sirupsen/logrus v1.8.1
github.com/stretchr/testify v1.6.1
github.com/tchap/go-patricia v2.2.6+incompatible
Expand All @@ -69,9 +68,6 @@ require (

// When updating replace rules, make sure to also update the rules in integration/client/go.mod
replace (
// prevent transitional dependencies due to containerd having a circular
// dependency on itself through plugins. see .empty-mod/go.mod for details
github.com/containerd/containerd => ./.empty-mod/
github.com/gogo/googleapis => github.com/gogo/googleapis v1.3.2
github.com/golang/protobuf => github.com/golang/protobuf v1.3.5
// urfave/cli must be <= v1.22.1 due to a regression: https://github.com/urfave/cli/issues/1092
Expand Down
Loading

0 comments on commit 09920a0

Please sign in to comment.