Skip to content
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

Replace gogo/protobuf with google/protobuf #5032

Merged
merged 13 commits into from
Nov 21, 2023
Merged

Replace gogo/protobuf with google/protobuf #5032

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0e07a14
Replace gogo/protobuf with google/protobuf
tdeebswihart Oct 24, 2023
1d3e2ce
Regenerate mocks, protobuf structs, etc.
tdeebswihart Oct 24, 2023
bae9157
Fix a bash-ism in protoc.sh
tdeebswihart Nov 20, 2023
567ce8e
Try to fix protoc.sh again
tdeebswihart Nov 20, 2023
1cd7ff5
Fix protoc. Again
tdeebswihart Nov 20, 2023
38cfeaf
Use GOOS when picking OS
tdeebswihart Nov 20, 2023
4614536
Point directly at my fork of the sdk
tdeebswihart Nov 21, 2023
8b6dff5
Fix a bug I introduced in timeout handling
tdeebswihart Nov 21, 2023
87a568e
Fix dlq printing
tdeebswihart Nov 21, 2023
9342736
Fix shellcheck complaints
tdeebswihart Nov 21, 2023
a00b509
Fix a few more test failures
tdeebswihart Nov 21, 2023
940dd3c
require.Contains doesn't work with proto objects
tdeebswihart Nov 21, 2023
7103d86
Remove replaces to my forks
tdeebswihart Nov 21, 2023
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
Prev Previous commit
Next Next commit
Use GOOS when picking OS
  • Loading branch information
@tdeebswihart
tdeebswihart committed Nov 21, 2023
commit 38cfeafdee684e6776bc030965fefd4cc43e3347
6 changes: 0 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,6 @@ endif
export TEST_TOTAL_SHARDS ?= $(BUILDKITE_PARALLEL_JOB_COUNT)
export TEST_SHARD_INDEX ?= $(BUILDKITE_PARALLEL_JOB)

SEDOPTION = -i
ifeq ($(shell uname -s),Darwin)
# MacOS uses BSD sed
SEDOPTION = -i ''
endif

##### Variables ######

GOBIN := $(if $(shell go env GOBIN),$(shell go env GOBIN),$(GOPATH)/bin)
Expand Down
4 changes: 2 additions & 2 deletions protoc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ PROTO_OUT=api
PROTO_OPTS="paths=source_relative:${PROTO_OUT}"

SED='sed -i'
case $(uname -s) in
Darwin*)
case $(go env GOOS) in
darwin*)
SED="sed -i ''"
;;
esac
Expand Down