Skip to content
This repository has been archived by the owner on May 13, 2022. It is now read-only.

Commit

Permalink
Upgrade Tendermint and over dependencies
Browse files Browse the repository at this point in the history
Note: we have been forced to upgrade our protobuf dependency but in
order to keep our custom gogoproto types we need to generated
marshallers for all types and handle this path specially.

Signed-off-by: Silas Davis <[email protected]>
  • Loading branch information
Silas Davis committed Jan 26, 2021
1 parent b27d0ff commit 710aff2
Show file tree
Hide file tree
Showing 276 changed files with 64,228 additions and 20,084 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- uses: actions/setup-go@v1
with:
go-version: 1.13
go-version: 1.15
id: go
- uses: actions/checkout@v2
- run: make test
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- run: git fetch --prune --unshallow
- uses: actions/setup-go@v1
with:
go-version: 1.13.x
go-version: 1.15
- uses: goreleaser/goreleaser-action@v1
with:
version: latest
Expand All @@ -30,7 +30,7 @@ jobs:
- run: git fetch --unshallow --prune
- uses: actions/setup-node@v1
with:
node-version: '12.x'
node-version: '14.x'
- run: echo ::set-env name=RELEASE_VERSION::${GITHUB_REF:10}
- name: publish
env:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- uses: actions/setup-go@v1
with:
go-version: 1.13
go-version: 1.15
id: go
- uses: actions/checkout@v2
- run: git fetch --unshallow --prune
Expand All @@ -27,7 +27,7 @@ jobs:
steps:
- uses: actions/setup-go@v1
with:
go-version: 1.13
go-version: 1.15
id: go
- uses: actions/checkout@v1
- run: make test_integration
Expand Down Expand Up @@ -66,9 +66,9 @@ jobs:
needs: unit
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v2
with:
node-version: '14.x'
node-version: '14'
- uses: actions/download-artifact@master
with:
name: burrow
Expand Down Expand Up @@ -114,9 +114,9 @@ jobs:
needs: unit
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v2
with:
node-version: '14.x'
node-version: '14'
- uses: actions/download-artifact@master
with:
name: burrow
Expand Down
13 changes: 10 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,13 @@ BURROW_TS_PATH = ./js
PROTO_GEN_TS_PATH = ${BURROW_TS_PATH}/proto
NODE_BIN = ${BURROW_TS_PATH}/node_modules/.bin

PROTO_FILES = $(shell find . -path $(BURROW_TS_PATH) -prune -o -path ./node_modules -prune -o -type f -name '*.proto' -print)
# To access Tendermint bundled protobuf files from go module cache
TENDERMINT_MOD=github.com/tendermint/tendermint
TENDERMINT_VERSION=$(shell go list -m -f '{{ .Version }}' $(TENDERMINT_MOD))
TENDERMINT_SRC=$(shell go env GOMODCACHE)/$(TENDERMINT_MOD)@$(TENDERMINT_VERSION)
TENDERMINT_PROTO=$(TENDERMINT_SRC)/proto

PROTO_FILES = $(shell find . $(TENDERMINT_PROTO) -path $(BURROW_TS_PATH) -prune -o -path ./node_modules -prune -o -type f -name '*.proto' -print)
PROTO_GO_FILES = $(patsubst %.proto, %.pb.go, $(PROTO_FILES))
PROTO_GO_FILES_REAL = $(shell find . -type f -name '*.pb.go' -print)
PROTO_TS_FILES = $(patsubst %.proto, %.pb.ts, $(PROTO_FILES))
Expand All @@ -88,11 +94,12 @@ protobuf: $(PROTO_GO_FILES) $(PROTO_TS_FILES) fix
# Implicit compile rule for GRPC/proto files (note since pb.go files no longer generated
# in same directory as proto file this just regenerates everything
%.pb.go: %.proto
protoc -I ./protobuf $< --gogo_out=plugins=grpc:${GOPATH}/src
protoc -I ./protobuf -I $(TENDERMINT_PROTO) $< --gogo_out=${GOPATH}/src --go-grpc_out=${GOPATH}/src

# Using this: https://github.com/agreatfool/grpc_tools_node_protoc_ts
%.pb.ts: %.proto
$(NODE_BIN)/grpc_tools_node_protoc -I protobuf \
mkdir -p $(PROTO_GEN_TS_PATH)
$(NODE_BIN)/grpc_tools_node_protoc -I protobuf -I $(TENDERMINT_PROTO) \
--plugin="protoc-gen-ts=$(NODE_BIN)/protoc-gen-ts" \
--js_out="import_style=commonjs,binary:${PROTO_GEN_TS_PATH}" \
--ts_out="generate_package_definition:${PROTO_GEN_TS_PATH}" \
Expand Down
76 changes: 35 additions & 41 deletions acm/acm.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 13 additions & 17 deletions acm/balance/balance.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 710aff2

Please sign in to comment.