From df85832514c00a47267b876ff3e2bd0e80751753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=9C=E5=86=BB=E8=99=BE=E4=BB=81?= Date: Fri, 25 Nov 2022 00:39:23 +0800 Subject: [PATCH 1/9] ut --- .github/workflows/ci_linux.yml | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_linux.yml b/.github/workflows/ci_linux.yml index f470b2b2c7..308cfc1a50 100644 --- a/.github/workflows/ci_linux.yml +++ b/.github/workflows/ci_linux.yml @@ -19,7 +19,7 @@ jobs: - name: install dependences run: | sudo apt-get install -y git g++ make libssl-dev libgflags-dev libprotobuf-dev libprotoc-dev protobuf-compiler libleveldb-dev libgoogle-perftools-dev - - name: config_brpc + - name: config brpc run: | ./config_brpc.sh --header="/usr/local/include /usr/include" --libs="/usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64" - name: compile @@ -58,3 +58,25 @@ jobs: - name: compile run: | bazel build -j ${{env.proc_num}} -c opt --copt -DHAVE_ZLIB=1 //... + + unittest: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: install dependences + run: | + sudo apt-get install -y git g++ make libssl-dev libgflags-dev libprotobuf-dev libprotoc-dev protobuf-compiler libleveldb-dev libgoogle-perftools-dev + sudo apt-get install -y cmake libgtest-dev && cd /usr/src/gtest && sudo cmake . && sudo make && sudo mv lib/libgtest* /usr/lib/ + - name: config brpc + run: | + ./config_brpc.sh --header="/usr/local/include /usr/include" --libs="/usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64" + - name: compile + run: | + cd test + make -j ${{env.proc_num}} + - name: run tests + run: | + cd test + sh ./run_tests.sh From 18b66115f81bb399481edd49634910d24d562727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=9C=E5=86=BB=E8=99=BE=E4=BB=81?= Date: Fri, 25 Nov 2022 00:51:27 +0800 Subject: [PATCH 2/9] Update ci_linux.yml --- .github/workflows/ci_linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_linux.yml b/.github/workflows/ci_linux.yml index 308cfc1a50..6e34cb38fa 100644 --- a/.github/workflows/ci_linux.yml +++ b/.github/workflows/ci_linux.yml @@ -19,7 +19,7 @@ jobs: - name: install dependences run: | sudo apt-get install -y git g++ make libssl-dev libgflags-dev libprotobuf-dev libprotoc-dev protobuf-compiler libleveldb-dev libgoogle-perftools-dev - - name: config brpc + - name: config_brpc run: | ./config_brpc.sh --header="/usr/local/include /usr/include" --libs="/usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64" - name: compile From 0bb3bbad41bc94f9de9c0bd64938631064d4c128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=9C=E5=86=BB=E8=99=BE=E4=BB=81?= Date: Fri, 25 Nov 2022 00:52:44 +0800 Subject: [PATCH 3/9] Update getting_started.md --- docs/cn/getting_started.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/cn/getting_started.md b/docs/cn/getting_started.md index d841cbcdc6..e234fbe6ec 100644 --- a/docs/cn/getting_started.md +++ b/docs/cn/getting_started.md @@ -38,7 +38,7 @@ sudo apt-get install -y libgoogle-perftools-dev 如果你要运行测试，那么要安装并编译libgtest-dev（它没有被默认编译）： ```shell -sudo apt-get install -y cmake libgtest-dev && cd /usr/src/gtest && sudo cmake . && sudo make && sudo mv libgtest* /usr/lib/ && cd - +sudo apt-get install -y cmake libgtest-dev && cd /usr/src/gtest && sudo cmake . && sudo make && sudo mv lib/libgtest* /usr/lib/ && cd - ``` gtest源码目录可能变动，如果`/usr/src/gtest`不存在，请尝试`/usr/src/googletest/googletest`。 From e8d3647d13c76e84659a516ea2c43955757c3d0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=9C=E5=86=BB=E8=99=BE=E4=BB=81?= Date: Fri, 25 Nov 2022 00:53:12 +0800 Subject: [PATCH 4/9] Update getting_started.md --- docs/en/getting_started.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/getting_started.md b/docs/en/getting_started.md index f704df9191..40d6888363 100644 --- a/docs/en/getting_started.md +++ b/docs/en/getting_started.md @@ -38,7 +38,7 @@ sudo apt-get install -y libgoogle-perftools-dev If you need to run tests, install and compile libgtest-dev (which is not compiled yet): ```shell -sudo apt-get install -y cmake libgtest-dev && cd /usr/src/gtest && sudo cmake . && sudo make && sudo mv libgtest* /usr/lib/ && cd - +sudo apt-get install -y cmake libgtest-dev && cd /usr/src/gtest && sudo cmake . && sudo make && sudo mv lib/libgtest* /usr/lib/ && cd - ``` The directory of gtest source code may be changed, try `/usr/src/googletest/googletest` if `/usr/src/gtest` is not there. From b3955e943ad01aeac26a0557f9d96c951ced6faf Mon Sep 17 00:00:00 2001 From: Ketor Date: Fri, 25 Nov 2022 09:09:33 +0800 Subject: [PATCH 5/9] Fix format issue of doc/cn/getting_started.md. (#2014) Signed-off-by: Ketor Signed-off-by: Ketor --- docs/cn/getting_started.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/cn/getting_started.md b/docs/cn/getting_started.md index d841cbcdc6..91b81c84a1 100644 --- a/docs/cn/getting_started.md +++ b/docs/cn/getting_started.md @@ -16,7 +16,7 @@ brpc有如下依赖： * [Fedora/CentOS](#fedoracentos) * [自己构建依赖的Linux](#自己构建依赖的Linux) * [MacOS](#macos) -* [docker][#docker] +* [docker](#docker) ## Ubuntu/LinuxMint/WSL ### 依赖准备 From 93a49cd826beadb34bc42121074c60671caf038b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=9C=E5=86=BB=E8=99=BE=E4=BB=81?= Date: Fri, 25 Nov 2022 09:36:25 +0800 Subject: [PATCH 6/9] Support Clang compile for Linux workflow (#2015) * clang * mergefile * bazel --- .github/workflows/ci_linux.yml | 64 +++++++++++++++++++++++++++++++--- 1 file changed, 59 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci_linux.yml b/.github/workflows/ci_linux.yml index f470b2b2c7..8e9aa807cc 100644 --- a/.github/workflows/ci_linux.yml +++ b/.github/workflows/ci_linux.yml @@ -10,7 +10,7 @@ env: proc_num: $(nproc) jobs: - compile-with-make: + gcc-compile-with-make: runs-on: ubuntu-latest # https://github.com/actions/runner-images steps: @@ -19,14 +19,64 @@ jobs: - name: install dependences run: | sudo apt-get install -y git g++ make libssl-dev libgflags-dev libprotobuf-dev libprotoc-dev protobuf-compiler libleveldb-dev libgoogle-perftools-dev - - name: config_brpc + - name: config brpc run: | ./config_brpc.sh --header="/usr/local/include /usr/include" --libs="/usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64" - name: compile run: | make -j ${{env.proc_num}} + + gcc-compile-with-cmake: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: install dependences + run: | + sudo apt-get install -y git g++ make libssl-dev libgflags-dev libprotobuf-dev libprotoc-dev protobuf-compiler libleveldb-dev + - name: cmake + run: | + mkdir build + cd build + cmake .. + - name: compile + run: | + cd build + make -j ${{env.proc_num}} + + gcc-compile-with-bazel: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: install dependences + run: | + sudo apt-get update + sudo apt-get install libibverbs-dev + - name: compile + run: | + bazel build -j ${{env.proc_num}} -c opt --copt -DHAVE_ZLIB=1 //... + - compile-with-cmake: + clang-compile-with-make: + runs-on: ubuntu-latest # https://github.com/actions/runner-images + + steps: + - uses: actions/checkout@v2 + + - name: install dependences + run: | + sudo apt-get install -y git g++ make libssl-dev libgflags-dev libprotobuf-dev libprotoc-dev protobuf-compiler libleveldb-dev libgoogle-perftools-dev + - name: config brpc + run: | + ./config_brpc.sh --header="/usr/local/include /usr/include" --libs="/usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64" --nodebugsymbols --cxx=clang++ --cc=clang + - name: compile + run: | + make -j ${{env.proc_num}} + + clang-compile-with-cmake: runs-on: ubuntu-latest steps: @@ -37,6 +87,8 @@ jobs: sudo apt-get install -y git g++ make libssl-dev libgflags-dev libprotobuf-dev libprotoc-dev protobuf-compiler libleveldb-dev - name: cmake run: | + export CC=clang + export CXX=clang++ mkdir build cd build cmake .. @@ -44,8 +96,8 @@ jobs: run: | cd build make -j ${{env.proc_num}} - - compile-with-bazel: + + clang-compile-with-bazel: runs-on: ubuntu-latest steps: @@ -57,4 +109,6 @@ jobs: sudo apt-get install libibverbs-dev - name: compile run: | + export CC=clang + export CXX=clang++ bazel build -j ${{env.proc_num}} -c opt --copt -DHAVE_ZLIB=1 //... From c1d1eaab3f563c6e1344276df3ed74a730876677 Mon Sep 17 00:00:00 2001 From: Weibing Wang Date: Fri, 25 Nov 2022 15:49:47 +0800 Subject: [PATCH 7/9] Update mbvar_c++.md --- docs/cn/mbvar_c++.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/cn/mbvar_c++.md b/docs/cn/mbvar_c++.md index cee99bba53..c68f95d76d 100644 --- a/docs/cn/mbvar_c++.md +++ b/docs/cn/mbvar_c++.md @@ -186,7 +186,7 @@ class MVariable { }; ``` -最常见的导出需求是通过HTTP接口查询和写入本地文件，多维度统计暂时不提供HTTP接口方式查询，后者已经在bvar中实现了，由用户选择开启，该功能由下面5个gflags控制，你的程序需要使用gflags。 +最常见的导出需求是通过HTTP接口查询和写入本地文件，多维度统计支持通过内置服务`/brpc_metrics`接口方式查询。也支持写入本地文件，该功能由下面5个gflags控制，你的程序需要使用gflags。 | 名称 | 默认值 | 描述 | | ------ | ------ | ------ | From 4063807d71ec0bd2d8a1e446e50c5855c667dba7 Mon Sep 17 00:00:00 2001 From: guodongxiaren <879231132@qq.com> Date: Sat, 26 Nov 2022 16:47:16 +0800 Subject: [PATCH 8/9] clang ut --- .github/workflows/ci_linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_linux.yml b/.github/workflows/ci_linux.yml index c4fa009b2b..5ef4c5ae2c 100644 --- a/.github/workflows/ci_linux.yml +++ b/.github/workflows/ci_linux.yml @@ -125,7 +125,7 @@ jobs: sudo apt-get install -y cmake libgtest-dev && cd /usr/src/gtest && sudo cmake . && sudo make && sudo mv lib/libgtest* /usr/lib/ - name: config brpc run: | - ./config_brpc.sh --header="/usr/local/include /usr/include" --libs="/usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64" + ./config_brpc.sh --header="/usr/local/include /usr/include" --libs="/usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64" --cc=clang --cxx=clang++ - name: compile run: | cd test From 8a0196ac8369d77395f5c32f47317aaf7aff7467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=9C=E5=86=BB=E8=99=BE=E4=BB=81?= Date: Sat, 26 Nov 2022 17:41:53 +0800 Subject: [PATCH 9/9] two ut --- .github/workflows/ci_linux.yml | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_linux.yml b/.github/workflows/ci_linux.yml index 5ef4c5ae2c..09d1eb6a48 100644 --- a/.github/workflows/ci_linux.yml +++ b/.github/workflows/ci_linux.yml @@ -58,6 +58,26 @@ jobs: - name: compile run: | bazel build -j ${{env.proc_num}} -c opt --copt -DHAVE_ZLIB=1 //... + gcc-unittest: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: install dependences + run: | + sudo apt-get install -y git g++ make libssl-dev libgflags-dev libprotobuf-dev libprotoc-dev protobuf-compiler libleveldb-dev libgoogle-perftools-dev + sudo apt-get install -y cmake libgtest-dev && cd /usr/src/gtest && sudo cmake . && sudo make && sudo mv lib/libgtest* /usr/lib/ + - name: config brpc + run: | + ./config_brpc.sh --header="/usr/local/include /usr/include" --libs="/usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64" --cc=gcc --cxx=g++ + - name: compile + run: | + cd test + make -j ${{env.proc_num}} + - name: run tests + run: | + cd test + sh ./run_tests.sh clang-compile-with-make: @@ -113,12 +133,11 @@ jobs: export CXX=clang++ bazel build -j ${{env.proc_num}} -c opt --copt -DHAVE_ZLIB=1 //... - unittest: + clang-unittest: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: install dependences run: | sudo apt-get install -y git g++ make libssl-dev libgflags-dev libprotobuf-dev libprotoc-dev protobuf-compiler libleveldb-dev libgoogle-perftools-dev