Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

What will happen #61

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions .github/workflows/SBCL-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,29 +34,37 @@ jobs:
sudo apt install -y cmake
sudo apt install -y build-essential autoconf libtool pkg-config

- name: Clone gRPC Github repo
run: git clone --recurse-submodules --depth 1 --shallow-submodules https://github.com/grpc/grpc
# - name: Clone gRPC Github repo
# run: git clone --recurse-submodules --depth 1 --shallow-submodules https://github.com/grpc/grpc

- name: Download and install protobuf
run: sudo apt install -y protobuf-compiler libprotobuf-dev libprotoc-dev libgrpc-dev libgrpc++-dev protobuf-compiler-grpc

- name: Build and install gRPC c++
run: |
cd grpc &&
mkdir cmake/build &&
pushd cmake/build &&
cmake -DgRPC_INSTALL=ON -DgRPC_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local/ ../.. &&
make -j 4 &&
sudo make install &&
sudo ldconfig &&
export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH &&
cd $GITHUB_WORKSPACE/quicklisp/local-projects/grpc &&
sudo make &&
popd
GRPC_ROOT=/usr make

# cd grpc &&
# mkdir cmake/build &&
# pushd cmake/build &&
# cmake -DgRPC_INSTALL=ON -DgRPC_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local/ ../.. &&
# make -j 4 &&
# sudo make install &&
# sudo ldconfig &&
# export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH &&
# cd $GITHUB_WORKSPACE/quicklisp/local-projects/grpc &&
# sudo make &&
# popd

- name: Install cl-protobufs (really only need protoc)
run: |
cd $GITHUB_WORKSPACE/quicklisp/local-projects
git clone https://github.com/qitab/cl-protobufs
cd cl-protobufs/protoc
PROTOC_ROOT=/usr/local make
PROTOC_ROOT=/usr make
echo "::add-path:$GITHUB_WORKSPACE/quicklisp/local-projects/cl-protobufs/protoc/"
echo $PATH

Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
GRPC_ROOT ?= /usr/local
LIBS = -lgrpc -lgpr
CFLAGS = $(shell pkg-config grpc --cflags) -I$(GRPC_ROOT)/include
CXXFLAGS = -std=c++14 -I$(GRPC_ROOT)/include -I.
LDFLAGS = -L$(GRPC_ROOT)/lib $(LIBS)
OFILES = client.o client_auth.o server.o

Expand Down
3 changes: 1 addition & 2 deletions client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@

#include <grpc/byte_buffer.h>
#include <grpc/grpc.h>
#include <grpc/impl/grpc_types.h>
#include <grpc/impl/slice_type.h>
#include <grpc/impl/codegen/grpc_types.h>
#include <grpc/slice.h>
#include <grpc/status.h>
#include <grpc/support/time.h>
Expand Down
3 changes: 1 addition & 2 deletions server.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include <grpc/grpc.h>
#include <grpc/grpc_security.h>
#include <grpc/grpc_security_constants.h>
#include <grpc/impl/slice_type.h>
#include <grpc/status.h>

namespace lisp {
Expand Down Expand Up @@ -79,7 +78,7 @@ grpc_server* start_server(grpc_completion_queue* cq,

grpc_server_register_completion_queue(server, cq, nullptr);

grpc_server_add_http2_port(server, server_address, server_creds);
grpc_server_add_secure_http2_port(server, server_address, server_creds);

return server;
}
Expand Down
Loading