Merge branch 'feature/118-boost-integration' of github.com:anarthal/boost-redis into feature/118-boost-integration

Author: anarthal

.github/workflows/ci.yml

@@ -101,7 +101,7 @@ jobs:
       run: choco install --no-progress -y openssl
 
     - name: Setup user-config.jam
-      run: cp tools/user-config.jam "$USERPROFILE/"
+      run: cp tools/user-config.jam "${HOMEDRIVE}${HOMEPATH}/"
 
     - name: Setup Boost
       run: python3 tools/ci.py setup-boost --source-dir=$(pwd)

.github/workflows/coverage.yml

@@ -1,9 +1,10 @@
 name: Coverage
 
-on:
-  push:
-    branches:
-      - develop
+on: push
+  # push:
+  #   branches:
+  #     - develop
+
 jobs:
   posix:
     defaults:
@@ -18,30 +19,32 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v3
-    - name: Install CMake
-      run: sudo apt-get -y install cmake
-    - name: Install lcov
-      run: sudo apt-get -y install lcov
-    - name: Install compiler
-      run: sudo apt-get -y install g++-11
-    - name: Install Redis
-      run: sudo apt-get -y install redis-server
-    - name: Install boost
-      uses: MarkusJx/[email protected]
-      id: install-boost
-      with:
-        boost_version: 1.81.0
-        platform_version: 22.04
+
+    - name: Install dependencies
+      run: sudo apt-get --no-install-recommends -y install cmake lcov g++-11 redis-server
+    
+    - name: Setup Boost
+      run: ./tools/ci.py setup-boost --source-dir=$(pwd)
+    
+    - name: Build Boost
+      run: ./tools/ci.py build-b2-distro --toolset=gcc-11
+    
+    # Having our library there confuses the coverage reports
+    - name: Remove Boost.Redis from the b2 distro
+      run: rm -rf ~/boost-b2-distro/include/boost/redis
+
     - name: Run CMake
-      run: |
-        BOOST_ROOT=${{steps.install-boost.outputs.BOOST_ROOT}} cmake --preset coverage .
+      run: cmake -DCMAKE_PREFIX_PATH=$HOME/boost-b2-distro --preset coverage .
+
     - name: Build
       run: cmake --build --preset coverage
+
     - name: Test
       run: ctest --preset coverage
+
     - name: Make the coverage file
       run: cmake --build --preset coverage --target coverage
+
     - name: Upload to codecov
       run: |
-        bash <(curl -s https://codecov.io/bash) -f ./build/coverage/coverage.info || echo "Codecov did not collect coverage reports"
-
+        bash <(curl -s https://codecov.io/bash) -f ./build/coverage/coverage.info

test/Jamfile

@@ -14,7 +14,19 @@ local requirements =
         <toolset>msvc:<cxxflags>"/bigobj"
         <target-os>windows:<define>_WIN32_WINNT=0x0601
         <include>../include
-        [ requires cxx17 ]
+        [ requires
+            cxx14_constexpr
+            cxx14_generic_lambdas
+            cxx14_initialized_lambda_captures
+            cxx14_aggregate_nsdmi
+            cxx14_return_type_deduction
+            cxx17_hdr_charconv
+            cxx17_hdr_optional
+            cxx17_hdr_string_view
+            cxx17_hdr_variant
+            cxx17_std_apply
+            cxx17_structured_bindings
+        ]
         [ ac.check-library /openssl//ssl    : <library>/openssl//ssl/<link>shared : <build>no ]
         [ ac.check-library /openssl//crypto : <library>/openssl//crypto/<link>shared : <build>no ]
         <library>/openssl//ssl/<link>shared

test/common.cpp

@@ -3,7 +3,6 @@
 #include <boost/asio/consign.hpp>
 #include <boost/asio/co_spawn.hpp>
 
-#include <boost/test/unit_test.hpp>
 
 namespace net = boost::asio;
 
@@ -15,7 +14,6 @@ struct run_callback {
    void operator()(boost::system::error_code const& ec) const
    {
       std::cout << "async_run: " << ec.message() << std::endl;
-      //BOOST_CHECK_EQUAL(ec, expected);
       conn->cancel(op);
    }
 };

tools/user-config.jam

@@ -4,10 +4,9 @@ import os ;
 
 local OPENSSL_ROOT = [ os.environ OPENSSL_ROOT ] ;
 
-project
-  : requirements
+using openssl : :
     <include>$(OPENSSL_ROOT)/include
-    <variant>debug:<library-path>$(OPENSSL_ROOT)/lib
-    <target-os>windows<variant>debug:<library-path>$(OPENSSL_ROOT)/debug/lib
-    <variant>release:<library-path>$(OPENSSL_ROOT)/lib
-  ;
+    <search>$(OPENSSL_ROOT)/lib
+    <ssl-name>libssl
+    <crypto-name>libcrypto
+;