Skip to content

Commit

Permalink
Replace capnp with grpc in integration test image
Browse files Browse the repository at this point in the history
ESI runtime is about to replace Cap'nProto with gRPC.
  • Loading branch information
teqdruid committed Jun 21, 2024
1 parent a6b6f03 commit 3fd702d
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 16 deletions.
6 changes: 3 additions & 3 deletions integration_test/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ COPY *.sh /tmp/
# Install modern release of CMake
RUN /tmp/cmake.sh

# Compile, install, then cleanup Cap'nProto
RUN /tmp/capnp.sh
RUN rm -r /tmp/capnp
# Compile, install, then cleanup gRPC
RUN /tmp/grpc.sh
RUN rm -r /tmp/grpc

# Compile, install, then cleanup Verilator
RUN /tmp/verilator.sh
Expand Down
13 changes: 0 additions & 13 deletions integration_test/capnp.sh

This file was deleted.

24 changes: 24 additions & 0 deletions integration_test/grpc.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/usr/bin/env bash

# Installs gRPC from source.

cd /tmp

# v1.54.2 is the version in Ubuntu 22.04
GRPC_VER=1.54.2
echo "Installing gRPC..."

if [ ! -d grpc ]; then
git clone --recurse-submodules -b v$GRPC_VER https://github.com/grpc/grpc
fi
cd grpc
mkdir -p cmake/build
cd cmake/build
cmake -S ../.. -B . \
-G Ninja \
-DgRPC_INSTALL=ON \
-DCMAKE_BUILD_TYPE=Release
ninja -j$(nproc)
ninja install

echo "Done."

0 comments on commit 3fd702d

Please sign in to comment.