Skip to content

Commit 9bfbc86

Browse files
Jonathan Godboutcopybara-github
Jonathan Godbout
authored andcommitted
Update gRPC to use the updated cl-protobufs cmake
In a recent pr cl-protobufs was updated to use a newer version of protocol buffers. That change had breaking changes for how we make protoc, so we must update our CI. PiperOrigin-RevId: 672605330
1 parent 917dd00 commit 9bfbc86

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

.github/workflows/CCL-test.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,13 @@ jobs:
5353
sudo make &&
5454
popd
5555
56-
- name: Install cl-protobufs (really only need protoc)
56+
- name: Install protoc plug-in
5757
run: |
5858
cd $GITHUB_WORKSPACE/quicklisp/local-projects
5959
git clone https://github.com/qitab/cl-protobufs
6060
cd cl-protobufs/protoc
61-
PROTOC_ROOT=/usr/local make
62-
echo "::add-path:$GITHUB_WORKSPACE/quicklisp/local-projects/cl-protobufs/protoc/"
63-
echo $PATH
61+
cmake . -DCMAKE_CXX_STANDARD=17
62+
cmake --build . --target install --parallel 16
6463
6564
- name: Start gRPC
6665
run: |

.github/workflows/SBCL-test.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,21 @@ jobs:
4343
mkdir cmake/build &&
4444
pushd cmake/build &&
4545
cmake -DgRPC_INSTALL=ON -DgRPC_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local/ ../.. &&
46-
make -j 4 &&
47-
sudo make install &&
46+
make -j20 &&
47+
sudo make install -j20 &&
4848
sudo ldconfig &&
4949
export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH &&
5050
cd $GITHUB_WORKSPACE/quicklisp/local-projects/grpc &&
51-
sudo make &&
51+
sudo make -j20 &&
5252
popd
5353
54-
- name: Install cl-protobufs (really only need protoc)
54+
- name: Install protoc plug-in
5555
run: |
5656
cd $GITHUB_WORKSPACE/quicklisp/local-projects
5757
git clone https://github.com/qitab/cl-protobufs
5858
cd cl-protobufs/protoc
59-
PROTOC_ROOT=/usr/local make
60-
echo "::add-path:$GITHUB_WORKSPACE/quicklisp/local-projects/cl-protobufs/protoc/"
61-
echo $PATH
59+
cmake . -DCMAKE_CXX_STANDARD=17
60+
cmake --build . --target install --parallel 16
6261
6362
- name: Start gRPC
6463
run: |

0 commit comments

Comments
 (0)