Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Update multiple dependencies to newer releases #8895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 10 commits into from
Jan 7, 2025
Merged

Update multiple dependencies to newer releases #8895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3f0f869
Update multiple dependencies to newer releases
Jan 7, 2025
6da7ef2
Update containernetworking/plugins Go package release to v1.6.2
Jan 7, 2025
72f9542
Update bats release to v1.11.1
Jan 7, 2025
0fe4097
Update buildah release to v1.38.0
Jan 7, 2025
fbc3ce5
Update golangci-lint release to v1.63.4
Jan 7, 2025
a9aa607
Update shfmt release to v3.10.0
Jan 7, 2025
3b94f59
Update gosec release to v2.21.4
Jan 7, 2025
458137a
Update release-notes release to v0.17.11
Jan 7, 2025
78c45f8
Update nix release to v2.24.11
Jan 7, 2025
f5e6d6f
Update nixpkgs to the latest HEAD commit
Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/nixpkgs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
schedule:
- cron: "0 0 * * 0" # At 00:00 on Sunday
env:
NIX_VERSION: "2.24.3"
NIX_VERSION: "2.24.11"
permissions:
contents: read

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
pull_request:
env:
GO_VERSION: "1.23"
NIX_VERSION: "2.24.3"
NIX_VERSION: "2.24.11"
permissions:
contents: read
jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
pull_request:
env:
GO_VERSION: "1.23"
GOLANGCI_LINT_VERSION: v1.62.2
GOLANGCI_LINT_VERSION: v1.63.4
permissions:
contents: read

Expand Down
10 changes: 5 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ TRIMPATH ?= -trimpath
GO_ARCH=$(shell $(GO) env GOARCH)
GO_BUILD ?= $(GO) build $(TRIMPATH)
GO_RUN ?= $(GO) run
NIX_IMAGE ?= nixos/nix:2.24.3
NIX_IMAGE ?= nixos/nix:2.24.11

PROJECT := github.com/cri-o/cri-o
CRIO_INSTANCE := crio_dev
Expand Down Expand Up @@ -51,19 +51,19 @@ GO_MD2MAN ?= ${BUILD_BIN_PATH}/go-md2man
GINKGO := ${BUILD_BIN_PATH}/ginkgo
MOCKGEN := ${BUILD_BIN_PATH}/mockgen
GOLANGCI_LINT := ${BUILD_BIN_PATH}/golangci-lint
GOLANGCI_LINT_VERSION := v1.62.2
GOLANGCI_LINT_VERSION := v1.63.4
GO_MOD_OUTDATED := ${BUILD_BIN_PATH}/go-mod-outdated
GO_MOD_OUTDATED_VERSION := 0.9.0
GOSEC := ${BUILD_BIN_PATH}/gosec
GOSEC_VERSION := 2.19.0
GOSEC_VERSION := 2.21.4
MDTOC := ${BUILD_BIN_PATH}/mdtoc
MDTOC_VERSION := v1.4.0
RELEASE_NOTES := ${BUILD_BIN_PATH}/release-notes
RELEASE_NOTES_VERSION := v0.17.8
RELEASE_NOTES_VERSION := v0.17.11
ZEITGEIST := ${BUILD_BIN_PATH}/zeitgeist
ZEITGEIST_VERSION := v0.5.4
SHFMT := ${BUILD_BIN_PATH}/shfmt
SHFMT_VERSION := v3.9.0
SHFMT_VERSION := v3.10.0
SHELLCHECK := ${BUILD_BIN_PATH}/shellcheck
SHELLCHECK_VERSION := v0.10.0
BATS_FILES := $(wildcard test/*.bats)
Expand Down
2 changes: 1 addition & 1 deletion contrib/test/ci/build/bats.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
git:
repo: "https://github.com/bats-core/bats-core.git"
dest: "{{ ansible_env.GOPATH }}/src/github.com/bats-core/bats-core"
version: v1.11.0
version: v1.11.1

- name: install bats
command: "./install.sh /usr/local"
Expand Down
2 changes: 1 addition & 1 deletion contrib/test/ci/build/plugins.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
git:
repo: "https://github.com/containernetworking/plugins.git"
dest: "{{ ansible_env.GOPATH }}/src/github.com/containernetworking/plugins"
version: v1.6.1
version: v1.6.2

- name: build plugins
command: "./build_linux.sh"
Expand Down
16 changes: 8 additions & 8 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies:
match: go

- name: golangci-lint
version: v1.62.2
version: v1.63.4
refPaths:
- path: .github/workflows/verify.yml
match: GOLANGCI_LINT_VERSION
Expand All @@ -34,7 +34,7 @@ dependencies:
match: SHELLCHECK_VERSION

- name: cni-plugins
version: v1.6.1
version: v1.6.2
refPaths:
- path: scripts/versions
match: cni-plugins
Expand All @@ -54,7 +54,7 @@ dependencies:
match: cri_tools_git_version

- name: buildah
version: v1.34.0
version: v1.38.0
refPaths:
- path: scripts/versions
match: buildah
Expand All @@ -66,7 +66,7 @@ dependencies:
match: runc

- name: bats
version: v1.11.0
version: v1.11.1
refPaths:
- path: scripts/versions
match: bats
Expand All @@ -80,7 +80,7 @@ dependencies:
match: ZEITGEIST_VERSION

- name: nix
version: 2.24.3
version: 2.24.11
refPaths:
- path: .github/workflows/test.yml
match: NIX_VERSION
Expand All @@ -90,13 +90,13 @@ dependencies:
match: NIX_IMAGE

- name: release-notes
version: 0.17.8
version: 0.17.11
refPaths:
- path: Makefile
match: RELEASE_NOTES_VERSION

- name: shfmt
version: 3.9.0
version: 3.10.0
refPaths:
- path: Makefile
match: SHFMT_VERSION
Expand All @@ -114,7 +114,7 @@ dependencies:
match: GOVULNCHECK_VERSION

- name: gosec
version: 2.19.0
version: 2.21.4
refPaths:
- path: Makefile
match: GOSEC_VERSION
Expand Down
67 changes: 34 additions & 33 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ require (
github.com/containerd/fifo v1.1.0
github.com/containerd/nri v0.9.0
github.com/containerd/otelttrpc v0.0.0-20240305015340-ea5083fda723
github.com/containerd/ttrpc v1.2.6-0.20240827082320-b5cd6e4b3287
github.com/containerd/ttrpc v1.2.7
github.com/containerd/typeurl v1.0.3-0.20220422153119-7f6e6d160d67
github.com/containernetworking/cni v1.2.3
github.com/containernetworking/plugins v1.6.1
github.com/containernetworking/plugins v1.6.2
github.com/containers/common v0.61.0
github.com/containers/conmon v2.0.20+incompatible
github.com/containers/conmon-rs v0.6.6
Expand All @@ -28,11 +28,11 @@ require (
github.com/coreos/go-systemd/v22 v22.5.1-0.20231103132048-7d375ecc2b09
github.com/creack/pty v1.1.24
github.com/cri-o/ocicni v0.4.3
github.com/cyphar/filepath-securejoin v0.3.5
github.com/cyphar/filepath-securejoin v0.3.6
github.com/docker/distribution v2.8.3+incompatible
github.com/docker/go-units v0.5.0
github.com/fsnotify/fsnotify v1.8.0
github.com/go-chi/chi/v5 v5.1.0
github.com/go-chi/chi/v5 v5.2.0
github.com/go-logr/logr v1.4.2
github.com/godbus/dbus/v5 v5.1.1-0.20230522191255-76236955d466
github.com/google/go-cmp v0.6.0
Expand All @@ -45,11 +45,11 @@ require (
github.com/moby/sys/mountinfo v0.7.2
github.com/moby/sys/user v0.3.0
github.com/moby/sys/userns v0.1.0
github.com/onsi/ginkgo/v2 v2.22.0
github.com/onsi/gomega v1.36.0
github.com/onsi/ginkgo/v2 v2.22.2
github.com/onsi/gomega v1.36.2
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.1.0
github.com/opencontainers/runc v1.2.1
github.com/opencontainers/runc v1.2.3
github.com/opencontainers/runtime-spec v1.2.0
github.com/opencontainers/runtime-tools v0.9.1-0.20241001195557-6c9570a1678f
github.com/opencontainers/selinux v1.11.1
Expand All @@ -62,15 +62,15 @@ require (
github.com/uptrace/opentelemetry-go-extra/otellogrus v0.3.2
github.com/urfave/cli/v2 v2.27.5
github.com/vishvananda/netlink v1.3.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.57.0
go.opentelemetry.io/otel v1.32.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0
go.opentelemetry.io/otel/sdk v1.32.0
go.opentelemetry.io/otel/trace v1.32.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0
go.opentelemetry.io/otel v1.33.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0
go.opentelemetry.io/otel/sdk v1.33.0
go.opentelemetry.io/otel/trace v1.33.0
go.uber.org/mock v0.5.0
golang.org/x/sys v0.28.0
google.golang.org/grpc v1.68.0
google.golang.org/protobuf v1.35.1
golang.org/x/sys v0.29.0
google.golang.org/grpc v1.68.1
google.golang.org/protobuf v1.36.1
k8s.io/api v0.31.4
k8s.io/apimachinery v0.31.4
k8s.io/client-go v0.31.4
Expand All @@ -89,7 +89,7 @@ require (
capnproto.org/go/capnp/v3 v3.0.1-alpha.2 // indirect
dario.cat/mergo v1.0.1 // indirect
github.com/Microsoft/hcsshim v0.12.9 // indirect
github.com/ProtonMail/go-crypto v1.0.0 // indirect
github.com/ProtonMail/go-crypto v1.1.3 // indirect
github.com/VividCortex/ewma v1.2.0 // indirect
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
Expand Down Expand Up @@ -122,8 +122,8 @@ require (
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.5.0 // indirect
github.com/go-git/go-git/v5 v5.12.0 // indirect
github.com/go-git/go-billy/v5 v5.6.1 // indirect
github.com/go-git/go-git/v5 v5.13.1 // indirect
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/analysis v0.23.0 // indirect
Expand All @@ -146,10 +146,10 @@ require (
github.com/google/go-intervals v0.0.2 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
github.com/gorilla/mux v1.8.1 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
Expand Down Expand Up @@ -209,24 +209,25 @@ require (
go.mongodb.org/mongo-driver v1.14.0 // indirect
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
go.opentelemetry.io/otel/log v0.6.0 // indirect
go.opentelemetry.io/otel/metric v1.32.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
golang.org/x/crypto v0.29.0 // indirect
go.opentelemetry.io/otel/metric v1.33.0 // indirect
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
golang.org/x/crypto v0.32.0 // indirect
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sync v0.9.0 // indirect
golang.org/x/term v0.26.0 // indirect
golang.org/x/text v0.20.0 // indirect
golang.org/x/mod v0.22.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/oauth2 v0.24.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/term v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.6.0 // indirect
golang.org/x/tools v0.26.0 // indirect
golang.org/x/tools v0.28.0 // indirect
google.golang.org/genproto v0.0.0-20240823204242-4ba0660f739c // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
Loading
Loading