From 58ccc6321edbbf709a6ba07fa7323b62bd7c40dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 11:11:29 -0400 Subject: [PATCH] Bump google.golang.org/protobuf from 1.36.5 to 1.36.6 (#515) * Bump google.golang.org/protobuf from 1.36.5 to 1.36.6 Bumps google.golang.org/protobuf from 1.36.5 to 1.36.6. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * fix? --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Scott Blum --- .circleci/config.yml | 14 +++++++------- Makefile | 13 ++++++------- go.mod | 4 ++-- go.sum | 4 ++-- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 30441dd..84fd9c7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,12 +9,6 @@ shared_configs: # Use the latest 2.1 version of CircleCI pipeline process engine. See: https://circleci.com/docs/2.0/configuration-reference version: 2.1 jobs: - build-1-21: - working_directory: ~/repo - docker: - - image: cimg/go:1.21 - steps: *simple_job_steps - build-1-22: working_directory: ~/repo docker: @@ -25,6 +19,12 @@ jobs: working_directory: ~/repo docker: - image: cimg/go:1.23 + steps: *simple_job_steps + + build-1-24: + working_directory: ~/repo + docker: + - image: cimg/go:1.24 steps: - checkout - run: @@ -35,6 +35,6 @@ jobs: workflows: pr-build-test: jobs: - - build-1-21 - build-1-22 - build-1-23 + - build-1-24 diff --git a/Makefile b/Makefile index abaaff5..5f8f884 100644 --- a/Makefile +++ b/Makefile @@ -50,9 +50,9 @@ generate: .tmp/protoc/bin/protoc .PHONY: checkgenerate checkgenerate: generate - git status --porcelain - @if [ -n "$$(git status --porcelain)" ]; then \ - git diff; \ + git status --porcelain -- '**/*.go' + @if [ -n "$$(git status --porcelain -- '**/*.go')" ]; then \ + git diff -- '**/*.go'; \ exit 1; \ fi @@ -69,7 +69,7 @@ vet: .PHONY: staticcheck staticcheck: - @go install honnef.co/go/tools/cmd/staticcheck@v0.5.1 + @go install honnef.co/go/tools/cmd/staticcheck@2025.1.1 staticcheck -checks "inherit,-SA1019" ./... .PHONY: ineffassign @@ -79,7 +79,7 @@ ineffassign: .PHONY: predeclared predeclared: - @go install github.com/nishanths/predeclared@245576f9a85c + @go install github.com/nishanths/predeclared@51e8c974458a0f93dc03fe356f91ae1a6d791e6f predeclared ./... # Intentionally omitted from CI, but target here for ad-hoc reports. @@ -95,8 +95,7 @@ errcheck: errcheck ./... .PHONY: test -test: - # The race detector requires CGO: https://github.com/golang/go/issues/6508 +test: deps CGO_ENABLED=1 go test -race ./... .tmp/protoc/bin/protoc: ./Makefile ./download_protoc.sh diff --git a/go.mod b/go.mod index ef59062..4d74384 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,13 @@ module github.com/fullstorydev/grpcurl go 1.21 -toolchain go1.23.7 +toolchain go1.24.1 require ( github.com/golang/protobuf v1.5.4 github.com/jhump/protoreflect v1.17.0 google.golang.org/grpc v1.61.0 - google.golang.org/protobuf v1.36.5 + google.golang.org/protobuf v1.36.6 ) require ( diff --git a/go.sum b/go.sum index 8880b2f..c8a46ee 100644 --- a/go.sum +++ b/go.sum @@ -116,8 +116,8 @@ google.golang.org/grpc v1.61.0 h1:TOvOcuXn30kRao+gfcvsebNEa5iZIiLkisYEkf7R7o0= google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= -google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY= +google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=