Merge branch 'master' into dependabot/cargo/shlex-1.3.0

Author: hawkingrei

.github/workflows/unit-test.yml

@@ -4,7 +4,7 @@ on: [ push,pull_request ]
 
 jobs:
   go:
-    name: Test go and binlog generation
+    name: Test go generation
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.x
@@ -18,8 +18,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
       - name: Test
-        run: make go binlog && git diff --exit-code
-
+        run: make go && git diff --exit-code
   cpp:
     name: Test cpp generation
     runs-on: ubuntu-latest
@@ -47,4 +46,4 @@ jobs:
         with:
           toolchain: stable
       - name: Test
-        run: make rust
+        run: make rust

.gitignore

@@ -4,3 +4,4 @@ target
 cpp/tipb/*.h
 cpp/tipb/*.cc
 cpp/build/
+bin

Makefile

@@ -1,23 +1,29 @@
-GOGO_PROTOBUF := `go list -f "{{.Dir}}" -m github.com/gogo/protobuf`
+.PHONY: all go rust c++
 
-.PHONY: all go rust binlog c++
+CURDIR := $(shell pwd)
 
-all: go rust binlog c++
+export GOBIN=$(CURDIR)/bin
+export PATH := $(CURDIR)/bin/:$(PATH)
+
+all: go rust c++
 
 dependence:
 	go mod download
 
-go: dependence
-	GOGO_PROTOBUF=${GOGO_PROTOBUF} ./generate-go.sh
+check: dependence
+	./scripts/check.sh
 
-rust:
-	cargo build
+go: dependence check
+	./scripts/generate-go.sh
+	GO111MODULE=on go mod tidy
+	GO111MODULE=on go build ./go-tipb/...
 
-binlog: dependence
-	GOGO_PROTOBUF=${GOGO_PROTOBUF} ./generate-binlog.sh
+rust: check
+	cargo check && \
+	cargo check --no-default-features --features prost-codec
 
 c++: dependence
-	./generate-cpp.sh
+	./scripts/generate-cpp.sh
 
 tipb.a:
 	mkdir -p cpp/build && cd cpp/build && cmake -DCMAKE_BUILD_TYPE=Release .. && make tipb

cpp/CMakeLists.txt

@@ -46,7 +46,7 @@ foreach (F ${PROTO_DEFS})
         OUTPUT "${PROTO_DEF_TMP_DIR}/${FIL_WE}.proto"
         WORKING_DIRECTORY ${PROTO_DEF_DIR}
         COMMAND cp ${ABS_FIL} ${PROTO_DEF_TMP_DIR}/${FIL_WE}.proto
-        COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/../generate-cpp.sh"
+        COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/../scripts/generate-cpp.sh"
         ARGS clean ${PROTO_DEF_TMP_DIR}/${FIL_WE}.proto
         DEPENDS ${ABS_FIL}
         COMMENT "Generating clean proto file on ${ABS_FIL}"