Skip to content

Commit

Permalink
Merge branch 'master' into ingest-logbackup-comp
Browse files Browse the repository at this point in the history
  • Loading branch information
disksing authored Jun 20, 2024
2 parents c5325a8 + bca367d commit 61f4ae2
Show file tree
Hide file tree
Showing 20 changed files with 3,917 additions and 1,593 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/cpp-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Update package lists
run: sudo apt update
- name: Install dependencies
run: sudo apt install -y cmake clang libclang-dev llvm llvm-dev
- name: Cache gRPC
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/rust-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Update package lists
run: sudo apt update
- name: Install dependencies (LLVM and compilers)
run: sudo apt install -y cmake clang libclang-dev llvm llvm-dev
- name: Install dependencies (protocol buffers compiler)
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ RUN apt-get update --yes \
&& apt-get install --yes curl unzip \
&& rm -rf /var/lib/apt/lists/*

ENV GO_VERSION "1.18.2"
ENV GO_VERSION "1.21.7"
RUN rm -rf /usr/local/go \
&& curl -O https://dl.google.com/go/go$GO_VERSION.linux-amd64.tar.gz \
&& tar -C /usr/local -xzf go$GO_VERSION.linux-amd64.tar.gz \
Expand Down
3 changes: 3 additions & 0 deletions OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# See the OWNERS docs at https://go.k8s.io/owners
approvers:
- sig-approvers
28 changes: 28 additions & 0 deletions OWNERS_ALIASES
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Sort the member alphabetically.
aliases:
emeritus-approvers: # do not assign it in any OWNERS file.
- tonyxuqqi # 2024-05
sig-approvers: # default approvers for the repo on rest folders.
- cfzjywxk
- lance6716
- overvenus
- you06
- YuJuncen
sig-approvers-pb: # default approvers for `proto` folder
- kevin-xialiu
- yudongusa
- zhangjinpeng1987
sig-approvers-pb-autoid: [bb7133, tiancaiamao]
sig-approvers-pb-br: [BornChanger, overvenus]
sig-approvers-pb-import: [BornChanger, D3Hunter, lance6716]
sig-approvers-pb-cdc: [flowbehappy, overvenus]
sig-approvers-pb-config: [overvenus]
sig-approvers-pb-coprocessor: [cfzjywxk]
sig-approvers-pb-deadlock: [MyonKeminta, cfzjywxk]
sig-approvers-pb-debug: [cfzjywxk]
sig-approvers-pb-pd: [niubell, rleungx]
sig-approvers-pb-raftstore: [zhangjinpeng1987, overvenus]
sig-approvers-pb-tikv: [zhangjinpeng1987]
sig-approvers-pb-error: [cfzjywxk]
sig-approvers-pb-kvrpc: [cfzjywxk]
sig-approvers-pb-trace: [you06]
19 changes: 18 additions & 1 deletion build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,27 @@
// limitations under the License.

use protobuf_build::Builder;
use std::fs;

fn main() {
let proto_dir = "proto";
let mut proto_files = Vec::new();

// Walk the proto directory and collect all .proto files.
for entry in fs::read_dir(proto_dir).unwrap() {
let entry = entry.unwrap();
let path = entry.path();
if path.is_file() {
if let Some(ext) = path.extension() {
if ext == "proto" {
proto_files.push(path.to_string_lossy().into_owned());
}
}
}
}

Builder::new()
.search_dir_for_protos("proto")
.files(&proto_files)
.append_to_black_list("eraftpb")
.generate()
}
241 changes: 139 additions & 102 deletions pkg/cdcpb/cdcpb.pb.go

Large diffs are not rendered by default.

Loading

0 comments on commit 61f4ae2

Please sign in to comment.