Shared object build

.github/workflows/tests.yml

@@ -5,6 +5,7 @@ on:
     branches: [master]
   pull_request: 
     branches: [master]
+    types: [opened, synchronize, reopened, ready_for_review]
 
 jobs:
   tests:
@@ -15,7 +16,7 @@ jobs:
       REDIS_QUEUE_HOST: redis
       REDIS_STATE_HOST: redis
     container:
-      image: faasm/faabric-cli:0.0.13
+      image: faasm/faabric-cli:0.0.14
     defaults:
       run:
         working-directory: /code/faabric

CMakeLists.txt

@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.13.0)
 project(faabric)
 
 option(FAABRIC_WASM_BUILD "Build Faabric wasm library" OFF)
-option(FAABRIC_STATIC_LIBS "Statically link Faabric libs" ON)
 option(FAABRIC_BUILD_TESTS "Build Faabric tests" ON)
 
 # Top-level CMake config
@@ -18,20 +17,20 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(THIRD_PARTY_INSTALL_DIR ${CMAKE_BINARY_DIR}/third-party)
 
 # Library funcs
-if (FAABRIC_STATIC_LIBS)
+if (BUILD_SHARED_LIBS)
     function(faabric_public_lib lib_name lib_deps)
-        add_library(${lib_name} STATIC ${lib_deps})
+        add_library(${lib_name} SHARED ${lib_deps})
     endfunction()
     function(faabric_private_lib lib_name lib_deps)
         add_library(${lib_name} STATIC ${lib_deps})
+        target_compile_options(${lib_name} PRIVATE "-fPIC")
     endfunction()
 else ()
     function(faabric_public_lib lib_name lib_deps)
-        add_library(${lib_name} SHARED ${lib_deps})
+        add_library(${lib_name} STATIC ${lib_deps})
     endfunction()
     function(faabric_private_lib lib_name lib_deps)
         add_library(${lib_name} STATIC ${lib_deps})
-        target_compile_options(${lib_name} PRIVATE "-fPIC")
     endfunction()
 endif ()
 

VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

docker/faabric.dockerfile

@@ -1,4 +1,4 @@
-FROM faasm/grpc-root:0.0.12
+FROM faasm/grpc-root:0.0.14
 ARG FAABRIC_VERSION
 
 # Note - the version of grpc-root here can be quite behind as it's rebuilt very

docker/grpc-root.dockerfile

@@ -32,10 +32,22 @@ RUN wget -q -O \
 RUN sh cmake-linux.sh -- --skip-license --prefix=/usr/local
 
 # gRPC, protobuf etc.
+# Static libs
 RUN git clone --recurse-submodules -b v1.31.0 https://github.com/grpc/grpc
-WORKDIR /setup/grpc/cmake/build
+WORKDIR /setup/grpc/cmake/build-static
 RUN cmake -GNinja \
     -DgRPC_INSTALL=ON \
+    -DBUILD_SHARED_LIBS=OFF \
+    -DgRPC_BUILD_TESTS=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr/local \
+    ../..
+RUN ninja install
+
+# Shared libs
+WORKDIR /setup/grpc/cmake/build-shared
+RUN cmake -GNinja \
+    -DgRPC_INSTALL=ON \
+    -DBUILD_SHARED_LIBS=ON \
     -DgRPC_BUILD_TESTS=OFF \
     -DCMAKE_INSTALL_PREFIX=/usr/local \
     ../..

src/proto/CMakeLists.txt

@@ -26,10 +26,10 @@ set(LIB_FILES
         ${OUTPUT_FILES}
         )
 
-if(FAABRIC_STATIC_LIBS)
-    faabric_private_lib(proto "${LIB_FILES}")
-else()
+if(BUILD_SHARED_LIBS)
     faabric_public_lib(proto "${LIB_FILES}")
+else()
+    faabric_private_lib(proto "${LIB_FILES}")
 endif()
 
 add_dependencies(proto spdlog_ext)

tasks/dev.py

@@ -15,7 +15,7 @@
 
 
 @task
-def cmake(ctx, clean=False):
+def cmake(ctx, clean=False, shared=False):
     """
     Configures the build
     """
@@ -30,6 +30,7 @@ def cmake(ctx, clean=False):
         "-GNinja",
         "-DCMAKE_INSTALL_PREFIX={}".format(_INSTALL_PREFIX),
         "-DCMAKE_BUILD_TYPE=Debug",
+        "-DBUILD_SHARED_LIBS={}".format("ON" if shared else "OFF"),
         "-DCMAKE_CXX_COMPILER=/usr/bin/clang++-10",
         "-DCMAKE_C_COMPILER=/usr/bin/clang-10",
         PROJ_ROOT,