Skip to content

Commit 21d19f0

Browse files
committed
Tweak import paths of .proto files in errorspb
This makes imports consistent both within this repository as well as in the main CockroachDB repo. This simplifies the Bazel migration as seen in cockroachdb/cockroach#57974.
1 parent 90d1628 commit 21d19f0

File tree

7 files changed

+116
-130
lines changed

7 files changed

+116
-130
lines changed

Makefile.update-protos

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ all: $(PROTOS)
3333
protoc \
3434
-I$$GOPATH/src/ \
3535
-I$$GOPATH/src/github.com \
36+
-I$$GOPATH/src/github.com/cockroachdb/errors \
3637
-I$$GOPATH/src/github.com/gogo/protobuf \
3738
-I$$GOPATH/src/github.com/gogo/protobuf/protobuf \
3839
--gogoroach_out=Mgoogle/protobuf/any.proto=github.com/gogo/protobuf/types,plugins=grpc,import_prefix=:. \
39-
$(PROTOS:%=$(GOPATH)/src/github.com/cockroachdb/errors/%)
40-
mv -f github.com/cockroachdb/errors/errorspb/*.pb.go errorspb/
40+
$(PROTOS)
4141
$(SED) $(SED_INPLACE) -E \
4242
-e '/import _ /d' \
4343
-e 's!import (fmt|math) "github.com/(fmt|math)"! !g' \

errorspb/errors.pb.go

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

errorspb/hintdetail.pb.go

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

errorspb/markers.pb.go

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

errorspb/markers.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ syntax = "proto3";
22
package cockroach.errorspb;
33
option go_package = "errorspb";
44

5-
import "github.com/cockroachdb/errors/errorspb/errors.proto";
5+
import "errorspb/errors.proto";
66
import "gogoproto/gogo.proto";
77

88
// MarkPayload is the error payload for a forced marker.

0 commit comments

Comments
 (0)