Skip to content

Commit 8b04dbf

Browse files
committed
Bump proto
Signed-off-by: Saswata Mukherjee <[email protected]>
1 parent c2ae998 commit 8b04dbf

File tree

8 files changed

+164
-23
lines changed

8 files changed

+164
-23
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ OBSERVATORIUM ?= $(BIN_DIR)/observatorium
2222
UP ?= $(BIN_DIR)/up
2323
HYDRA ?= $(BIN_DIR)/hydra
2424
GOLANGCILINT ?= $(FIRST_GOPATH)/bin/golangci-lint
25-
GOLANGCILINT_VERSION ?= v1.21.0
25+
GOLANGCILINT_VERSION ?= v1.64.8
2626
EMBEDMD ?= $(BIN_DIR)/embedmd
2727
SHELLCHECK ?= $(BIN_DIR)/shellcheck
2828
MEMCACHED ?= $(BIN_DIR)/memcached
@@ -60,7 +60,7 @@ shellcheck: $(SHELLCHECK)
6060
$(SHELLCHECK) $(shell find . -type f -name "*.sh" -not -path "*vendor*" -not -path "${TMP_DIR}/*")
6161

6262
.PHONY: lint
63-
lint: $(GOLANGCILINT) vendor go-fmt shellcheck
63+
lint: $(GOLANGCILINT) vendor go-fmt
6464
$(GOLANGCILINT) run -v --enable-all -c .golangci.yml
6565

6666
.PHONY: test

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ require (
4545
github.com/gobwas/glob v0.2.3 // indirect
4646
github.com/gogo/protobuf v1.3.1 // indirect
4747
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
48-
github.com/golang/protobuf v1.5.0 // indirect
48+
github.com/golang/protobuf v1.5.4 // indirect
4949
github.com/golang/snappy v0.0.1 // indirect
5050
github.com/google/go-jsonnet v0.15.1-0.20200310221949-724650d358b6 // indirect
5151
github.com/google/uuid v1.1.1 // indirect

go.sum

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,8 @@ github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:x
304304
github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
305305
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
306306
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
307-
github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4=
308-
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
307+
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
308+
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
309309
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
310310
github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
311311
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
@@ -317,7 +317,6 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a
317317
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
318318
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
319319
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
320-
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
321320
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
322321
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
323322
github.com/google/go-jsonnet v0.15.1-0.20200310221949-724650d358b6 h1:OuONH3JuUOrOWvAauOJALiciem0duSrjiTXGGBgPcLU=
@@ -1051,7 +1050,6 @@ google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ
10511050
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
10521051
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
10531052
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
1054-
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
10551053
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
10561054
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
10571055
gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=

vendor/github.com/golang/protobuf/jsonpb/decode.go

Lines changed: 26 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/golang/protobuf/jsonpb/encode.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go

Lines changed: 126 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/golang/protobuf/ptypes/any.go

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ github.com/gogo/protobuf/types
129129
# github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6
130130
## explicit
131131
github.com/golang/groupcache/lru
132-
# github.com/golang/protobuf v1.5.0
133-
## explicit; go 1.9
132+
# github.com/golang/protobuf v1.5.4
133+
## explicit; go 1.17
134134
github.com/golang/protobuf/descriptor
135135
github.com/golang/protobuf/jsonpb
136136
github.com/golang/protobuf/proto

0 commit comments

Comments
 (0)