Skip to content

Commit

Permalink
update with new design that blob entry stores reference
Browse files Browse the repository at this point in the history
  • Loading branch information
mzhl1111 committed Jul 11, 2024
1 parent d4a17c9 commit 5b23feb
Show file tree
Hide file tree
Showing 18 changed files with 12,751 additions and 22,218 deletions.
14 changes: 7 additions & 7 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pull_request_rules:
conditions:
- or:
- base=master
- base~=^2(\.\d+){1,2}$
- base=2.2
- -status-success=DCO
actions:
label:
Expand All @@ -16,7 +16,7 @@ pull_request_rules:
conditions:
- or:
- base=master
- base~=^2(\.\d+){1,2}$
- base=2.2
- status-success=DCO
actions:
label:
Expand All @@ -29,7 +29,7 @@ pull_request_rules:
conditions:
- or:
- base=master
- base~=^2(\.\d+){1,2}$
- base=2.2
- -body~=\#[0-9]{1,6}(\s+|$)
- -body~=https://github.com/milvus-io/milvus/issues/[0-9]{1,6}(\s+|$)
- -body~=https://github.com/milvus-io/milvus-proto/issues/[0-9]{1,6}(\s+|$)
Expand All @@ -49,7 +49,7 @@ pull_request_rules:
- and:
- or:
- base=master
- base~=^2(\.\d+){1,2}$
- base=2.2
- or:
- body~=\#[0-9]{1,6}(\s+|$)
- body~=https://github.com/milvus-io/milvus/issues/[0-9]{1,6}(\s+|$)
Expand All @@ -66,7 +66,7 @@ pull_request_rules:
conditions:
- or:
- base=master
- base~=^2(\.\d+){1,2}$
- base=2.2
- title~=\[automated\]
actions:
label:
Expand All @@ -78,7 +78,7 @@ pull_request_rules:
conditions:
- or:
- base=master
- base~=^2(\.\d+){1,2}$
- base=2.2
- "status-success=Run Check Proto (3.8)"
actions:
label:
Expand All @@ -89,7 +89,7 @@ pull_request_rules:
conditions:
- or:
- base=master
- base~=^2(\.\d+){1,2}$
- base=2.2
- "status-success!=Run Check Proto (3.8)"
actions:
label:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
branches:
- master
- "[0-9]+.[0-9]+"
- '2.2'

jobs:
build:
Expand Down Expand Up @@ -33,4 +33,4 @@ jobs:
run: |
python -m grpc_tools.protoc -I ./proto --python_out=./ ./proto/common.proto
python -m grpc_tools.protoc -I ./proto --python_out=./ ./proto/schema.proto
python -m grpc_tools.protoc -I ./proto --python_out=./ --grpc_python_out=./ ./proto/milvus.proto
python -m grpc_tools.protoc -I ./proto --python_out=./ --grpc_python_out=./ ./proto/milvus.proto
7 changes: 2 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ PWD := $(shell pwd)
GOPATH := $(shell $(GO) env GOPATH)
PROTOC := $(shell which protoc)
PROTOC_VER := $(shell protoc --version)
INSTALL_PATH := $(PWD)/bin

all: generate-proto

Expand All @@ -12,10 +11,8 @@ build:

generate-proto: export protoc:=${PWD}/cmake-build/protobuf/protobuf-build/protoc
generate-proto: build
@echo "Generate proto files"
@echo "Installing protoc-gen-go to ./bin" && GOBIN=$(INSTALL_PATH) go install google.golang.org/protobuf/cmd/[email protected]
@echo "Installing protoc-gen-go-grpc to ./bin" && GOBIN=$(INSTALL_PATH) go install google.golang.org/grpc/cmd/[email protected]
@(env bash $(PWD)/scripts/proto_gen_go.sh $(INSTALL_PATH))
@which protoc-gen-go 1>/dev/null || (echo "Installing protoc-gen-go" && go install github.com/golang/protobuf/[email protected])
@(env bash $(PWD)/scripts/proto_gen_go.sh)

clean:
@echo "Cleaning up all the generated files"
Expand Down
Loading

0 comments on commit 5b23feb

Please sign in to comment.