Skip to content

Commit

Permalink
Merge pull request #185 from kwilczynski/feature/update-old-dependencies
Browse files Browse the repository at this point in the history
Update old dependencies and refresh Go version
  • Loading branch information
openshift-merge-bot[bot] authored Jan 24, 2024
2 parents e3223f5 + bef41c6 commit 7bfed63
Show file tree
Hide file tree
Showing 47 changed files with 439 additions and 3,926 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: test
on: ["push", "pull_request"]

env:
GO_VERSION: "1.18"
GO_VERSION: "1.20"
LINUX_ARCHES: "amd64 386 arm arm64 s390x mips64le ppc64le"

jobs:
Expand All @@ -13,10 +13,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: setup go
uses: actions/setup-go@v1
uses: actions/setup-go@v5
with:
go-version: ${{ env.GO_VERSION }}
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Build on all supported architectures
run: |
Expand All @@ -31,10 +31,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: setup go
uses: actions/setup-go@v1
uses: actions/setup-go@v5
with:
go-version: ${{ env.GO_VERSION }}
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Install test binaries
env:
Expand Down
14 changes: 7 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
module github.com/cri-o/ocicni

go 1.17
go 1.20

require (
github.com/containernetworking/cni v1.1.2
github.com/containernetworking/plugins v1.4.0
github.com/fsnotify/fsnotify v1.7.0
github.com/onsi/ginkgo/v2 v2.13.2
github.com/onsi/gomega v1.30.0
github.com/onsi/ginkgo/v2 v2.15.0
github.com/onsi/gomega v1.31.1
github.com/sirupsen/logrus v1.9.3
github.com/vishvananda/netlink v1.2.1-beta.2
)
Expand All @@ -18,9 +18,9 @@ require (
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/pprof v0.0.0-20230323073829-e72429f035bd // indirect
github.com/vishvananda/netns v0.0.4 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/tools v0.14.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.16.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
2,572 changes: 12 additions & 2,560 deletions go.sum

Large diffs are not rendered by default.

43 changes: 43 additions & 0 deletions vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md

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

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

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

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

110 changes: 98 additions & 12 deletions vendor/github.com/onsi/ginkgo/v2/ginkgo_t_dsl.go

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

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

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

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

8 changes: 4 additions & 4 deletions vendor/github.com/onsi/ginkgo/v2/internal/suite.go

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

Loading

0 comments on commit 7bfed63

Please sign in to comment.