Skip to content

Commit bf2425f

Browse files
committed
Fix compile errors of json2pb
1 parent ba9e838 commit bf2425f

10 files changed

Lines changed: 206 additions & 200 deletions

File tree

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
inputs:
2+
protobuf-version:
3+
description: version of protobuf
4+
required: true
5+
protobuf-cpp-version:
6+
description: version of protobuf-cpp
7+
required: true
8+
protobuf-install-dir:
9+
description: install directory of protobuf
10+
required: true
11+
config-brpc-options:
12+
description: extra options for config_brpc.sh
13+
required: true
14+
runs:
15+
using: "composite"
16+
steps:
17+
- run: |
18+
wget https://github.com/protocolbuffers/protobuf/releases/download/v${{inputs.protobuf-version}}/protobuf-cpp-${{inputs.protobuf-cpp-version}}.tar.gz
19+
tar -xf protobuf-cpp-${{inputs.protobuf-cpp-version}}.tar.gz
20+
cd protobuf-${{inputs.protobuf-cpp-version}}
21+
./configure --prefix=${{inputs.protobuf-install-dir}} --with-pic --disable-java --disable-python --disable-other-languages
22+
sudo mkdir ${{inputs.protobuf-install-dir}}
23+
make -j ${{env.proc_num}} && sudo make install
24+
shell: bash
25+
- uses: ./.github/actions/compile-with-make
26+
with:
27+
options: --headers="${{inputs.protobuf-install-dir}}/include /usr/include" --libs="${{inputs.protobuf-install-dir}} /usr/lib /usr/lib64" ${{inputs.config-brpc-options}}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
inputs:
2+
options:
3+
description: extra options for config_brpc.sh
4+
required: false
5+
runs:
6+
using: "composite"
7+
steps:
8+
- run: |
9+
sh config_brpc.sh --nodebugsymbols ${{inputs.options}}
10+
cat config.mk && make clean && make -j ${{env.proc_num}}
11+
shell: bash

.github/actions/init-make-config/action.yml

Lines changed: 0 additions & 9 deletions
This file was deleted.

.github/actions/init-ut-make-config/action.yml

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,22 @@ inputs:
55
runs:
66
using: "composite"
77
steps:
8-
- run: sudo apt-get update && sudo apt-get install -y clang-12 lldb-12 lld-12 libgtest-dev cmake gdb libstdc++6-11-dbg && cd /usr/src/gtest && export CC=clang-12 && export CXX=clang++-12 && sudo cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 . && sudo make -j ${{env.proc_num}} && sudo mv lib/libgtest* /usr/lib/
9-
shell: bash
10-
- run: sudo git clone https://github.com/libunwind/libunwind.git && cd libunwind && sudo git checkout tags/v1.8.1 && sudo mkdir -p /libunwind && sudo autoreconf -i && sudo CC=clang-12 CXX=clang++-12 ./configure --prefix=/libunwind && sudo make -j ${{env.proc_num}} && sudo make install
11-
shell: bash
12-
- run: sudo git clone https://github.com/gperftools/gperftools.git && cd gperftools && sudo git checkout tags/gperftools-2.16 && sudo mkdir -p /gperftools && sudo ./autogen.sh && sudo CC=clang-12 CXX=clang++-12 ./configure --prefix=/gperftools --enable-frame-pointers && sudo make -j ${{env.proc_num}} && sudo make install
13-
shell: bash
14-
- run: sh config_brpc.sh --headers="/libunwind/include /gperftools/include /usr/include" --libs="/libunwind/lib /gperftools/lib /usr/lib /usr/lib64" ${{inputs.options}}
15-
shell: bash
8+
- run: |
9+
sudo apt-get update && sudo apt-get install -y clang-12 lldb-12 lld-12 libgtest-dev cmake gdb libstdc++6-11-dbg
10+
cd /usr/src/gtest && export CC=clang-12 && export CXX=clang++-12 && sudo cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 .
11+
sudo make -j ${{env.proc_num}} && sudo mv lib/libgtest* /usr/lib/
12+
shell: bash
13+
- run: |
14+
sudo git clone https://github.com/libunwind/libunwind.git
15+
cd libunwind && sudo git checkout tags/v1.8.1 && sudo mkdir -p /libunwind
16+
sudo autoreconf -i && sudo CC=clang-12 CXX=clang++-12 ./configure --prefix=/libunwind
17+
sudo make -j ${{env.proc_num}} && sudo make install
18+
shell: bash
19+
- run: |
20+
sudo git clone https://github.com/gperftools/gperftools.git
21+
cd gperftools && sudo git checkout tags/gperftools-2.16 && sudo mkdir -p /gperftools
22+
sudo ./autogen.sh && sudo CC=clang-12 CXX=clang++-12 ./configure --prefix=/gperftools --enable-frame-pointers
23+
sudo make -j ${{env.proc_num}} && sudo make install
24+
shell: bash
25+
- run: sh config_brpc.sh --headers="/libunwind/include /gperftools/include /usr/include" --libs="/libunwind/lib /gperftools/lib /usr/lib /usr/lib64" ${{inputs.options}}
26+
shell: bash
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
runs:
22
using: "composite"
33
steps:
4-
- uses: ./.github/actions/install-essential-dependences
4+
- uses: ./.github/actions/install-essential-dependencies
55
- run: sudo apt-get install -y libunwind-dev libgoogle-glog-dev automake bison flex libboost-all-dev libevent-dev libtool pkg-config libibverbs1 libibverbs-dev
66
shell: bash
77
- run: wget https://archive.apache.org/dist/thrift/0.11.0/thrift-0.11.0.tar.gz && tar -xf thrift-0.11.0.tar.gz
88
shell: bash
9-
- run: cd thrift-0.11.0/ && ./configure --prefix=/usr --with-rs=no --with-ruby=no --with-python=no --with-java=no --with-go=no --with-perl=no --with-php=no --with-csharp=no --with-erlang=no --with-lua=no --with-nodejs=no --with-haskell=no --with-dotnetcore=no CXXFLAGS="-Wno-unused-variable" && make -j $(nproc) && sudo make install
9+
- run: cd thrift-0.11.0/ && ./configure --prefix=/usr --with-rs=no --with-ruby=no --with-python=no --with-java=no --with-go=no --with-perl=no --with-php=no --with-csharp=no --with-erlang=no --with-lua=no --with-nodejs=no --with-haskell=no --with-dotnetcore=no CXXFLAGS="-Wno-unused-variable" && make -j ${{env.proc_num}} && sudo make install
1010
shell: bash

.github/actions/install-essential-dependences/action.yml renamed to .github/actions/install-essential-dependencies/action.yml

File renamed without changes.

0 commit comments

Comments
 (0)