From a313a9f49a94d9481184c448daa14fcb531cfc76 Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Fri, 12 Apr 2024 15:15:51 +0100 Subject: [PATCH 1/2] ensure minimum of protobuf 1.33.0 --- go.mod | 4 ++++ go.sum | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 3b1739f8f1..b47c203e29 100644 --- a/go.mod +++ b/go.mod @@ -141,3 +141,7 @@ require ( ) replace github.com/golang/glog => github.com/nginxinc/glog v1.1.2 + +replace google.golang.org/protobuf v1.26.0 => google.golang.org/protobuf v1.33.0 + +replace google.golang.org/protobuf v1.26.0-rc.1 => google.golang.org/protobuf v1.33.0 diff --git a/go.sum b/go.sum index 29a7d5aaa1..9de0fa4f9a 100644 --- a/go.sum +++ b/go.sum @@ -373,8 +373,6 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= -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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From 514029359ed9b1eda3090f6d597ffc8c43af8fb4 Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Mon, 15 Apr 2024 10:22:49 +0100 Subject: [PATCH 2/2] update labeller config --- .github/labeler.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 4773a321a6..f283127576 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -11,13 +11,13 @@ chore: - all: - changed-files: - any-glob-to-any-file: ['.github/**/*', 'hack/**/*', '*'] - - all-globs-to-any-files: ['!*.md'] + - all-globs-to-all-files: ['!*.md'] tests: - all: - - changed-files: - - any-glob-to-any-file: ['tests/**/*', 'perf-tests/**/*'] - - all-globs-to-all-files: ['!tests/requirements.txt', '!perf-tests/requirements.txt'] + - changed-files: + - any-glob-to-any-file: ['tests/**/*', 'perf-tests/**/*'] + - all-globs-to-all-files: ['!tests/requirements.txt', '!perf-tests/requirements.txt'] documentation: - head-branch: ['^docs/', '^doc/']