ci: b2 workflow builds examples

Author: ashtum

.github/workflows/ci.yml

@@ -135,7 +135,7 @@ jobs:
             generator: "MinGW Makefiles"
             is-latest: true
             is-earliest: true
-            name: "MinGW"
+            name: "MinGW (shared)"
             shared: true
             build-type: "Release"
             build-cmake: true
@@ -149,7 +149,7 @@ jobs:
             generator: "MinGW Makefiles"
             is-latest: true
             is-earliest: true
-            name: "MinGW"
+            name: "MinGW (static)"
             shared: false
             build-type: "Release"
             build-cmake: true
@@ -339,7 +339,7 @@ jobs:
             b2-toolset: "gcc"
             is-latest: true
             name: "GCC 14: C++17-20 (ubsan)"
-            shared: true
+            shared: false
             ubsan: true
             build-type: "RelWithDebInfo"
 
@@ -848,7 +848,7 @@ jobs:
           ref: develop
 
       - name: Setup C++
-        uses: alandefreitas/cpp-actions/setup-cpp@v1.8.10
+        uses: ashtum/cpp-actions/setup-cpp@v1.8.13
         id: setup-cpp
         with:
           compiler: ${{ matrix.compiler }}
@@ -857,17 +857,17 @@ jobs:
           trace-commands: true
 
       - name: Install packages
-        uses: alandefreitas/cpp-actions/package-install@v1.8.10
+        uses: ashtum/cpp-actions/package-install@v1.8.13
         id: package-install
         with:
           apt-get-add-architecture: ${{ matrix.x86 && 'i386' || '' }}
           apt-get: >-
             ${{ matrix.install }}
             build-essential libssl-dev zlib1g-dev libbrotli-dev libpsl-dev
-            ${{ matrix.x86 && 'zlib1g-dev:i386 libbrotli-dev:i386 libpsl-dev:i386' || '' }}
+            ${{ matrix.x86 && 'libssl-dev:i386 zlib1g-dev:i386 libbrotli-dev:i386 libpsl-dev:i386' || '' }}
 
       - name: Clone Boost
-        uses: alandefreitas/cpp-actions/boost-clone@v1.8.10
+        uses: ashtum/cpp-actions/boost-clone@v1.8.13
         id: boost-clone
         with:
           branch: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }}
@@ -886,7 +886,7 @@ jobs:
             rts
 
       - name: Install Packages (Windows)
-        uses: alandefreitas/cpp-actions/package-install@v1.8.10
+        uses: ashtum/cpp-actions/package-install@v1.8.13
         if: ${{ startsWith(matrix.runs-on, 'windows') }}
         id: package-install-windows
         with:
@@ -958,7 +958,7 @@ jobs:
           cp -r "$workspace_root"/rts-root libs/rts
 
       - name: Boost B2 Workflow
-        uses: alandefreitas/cpp-actions/b2-workflow@v1.8.10
+        uses: ashtum/cpp-actions/b2-workflow@v1.8.13
         if: ${{ !matrix.coverage && !matrix.time-trace }}
         env:
           ASAN_OPTIONS: ${{ (startsWith(matrix.compiler, 'apple-clang') && 'detect_invalid_pointer_pairs=0') || 'detect_invalid_pointer_pairs=2' }}
@@ -977,9 +977,10 @@ jobs:
           cxxflags: ${{ (matrix.asan && '-fsanitize=pointer-subtract') || '' }}
           user-config: ${{ (startsWith(matrix.runs-on, 'windows') && format('{0}/user-config.jam', steps.patch.outputs.workspace_root)) || '' }}
           stop-on-error: true
+          extra-args: "libs/http_io/example" # https://github.com/ashtum/cpp-actions/issues/23
 
       - name: Boost CMake Workflow
-        uses: alandefreitas/cpp-actions/cmake-workflow@v1.8.10
+        uses: ashtum/cpp-actions/cmake-workflow@v1.8.13
         if: ${{ matrix.coverage || matrix.time-trace || matrix.build-cmake || matrix.is-earliest }}
         with:
           source-dir: boost-root
@@ -1016,7 +1017,7 @@ jobs:
           echo "LD_LIBRARY_PATH=$GITHUB_WORKSPACE/.local/lib:$LD_LIBRARY_PATH" >> "$GITHUB_ENV"
 
       - name: Find Package Integration Workflow
-        uses: alandefreitas/cpp-actions/cmake-workflow@v1.8.10
+        uses: ashtum/cpp-actions/cmake-workflow@v1.8.13
         if: ${{ matrix.build-cmake || matrix.is-earliest }}
         with:
           source-dir: boost-root/libs/${{ steps.patch.outputs.module }}/test/cmake_test
@@ -1040,7 +1041,7 @@ jobs:
           toolchain: ${{ (startsWith(matrix.runs-on, 'windows') && steps.patch-user-config.outputs.toolchain) || '' }}
 
       - name: Subdirectory Integration Workflow
-        uses: alandefreitas/cpp-actions/cmake-workflow@v1.8.10
+        uses: ashtum/cpp-actions/cmake-workflow@v1.8.13
         if: ${{ matrix.build-cmake || matrix.is-earliest }}
         with:
           source-dir: boost-root/libs/${{ steps.patch.outputs.module }}/test/cmake_test
@@ -1061,7 +1062,7 @@ jobs:
           toolchain: ${{ (startsWith(matrix.runs-on, 'windows') && steps.patch-user-config.outputs.toolchain) || '' }}
 
       - name: Root Project CMake Workflow
-        uses: alandefreitas/cpp-actions/cmake-workflow@v1.8.10
+        uses: ashtum/cpp-actions/cmake-workflow@v1.8.13
         if: ${{ matrix.build-cmake || matrix.is-earliest }}
         with:
           source-dir: boost-root/libs/${{ steps.patch.outputs.module }}
@@ -1084,7 +1085,7 @@ jobs:
           toolchain: ${{ (startsWith(matrix.runs-on, 'windows') && steps.patch-user-config.outputs.toolchain) || '' }}
 
       - name: FlameGraph
-        uses: alandefreitas/cpp-actions/flamegraph@v1.8.10
+        uses: ashtum/cpp-actions/flamegraph@v1.8.13
         if: matrix.time-trace
         with:
           source-dir: boost-root/libs/http_io
@@ -1137,7 +1138,7 @@ jobs:
           fetch-depth: 100
 
       - name: Changelog
-        uses: alandefreitas/cpp-actions/create-changelog@v1.8.10
+        uses: ashtum/cpp-actions/create-changelog@v1.8.13
         with:
           thank-non-regular: ${{ startsWith(github.ref, 'refs/tags/') }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -1159,7 +1160,7 @@ jobs:
         shell: bash
     steps:
       - name: Install packages
-        uses: alandefreitas/cpp-actions/package-install@v1.8.7
+        uses: ashtum/cpp-actions/package-install@v1.8.13
         with:
           apt-get: git cmake
 
@@ -1190,7 +1191,7 @@ jobs:
           ref: develop
 
       - name: Clone Boost
-        uses: alandefreitas/cpp-actions/boost-clone@v1.8.10
+        uses: ashtum/cpp-actions/boost-clone@v1.8.13
         id: boost-clone
         with:
           branch: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }}

example/client/burl/Jamfile

@@ -12,21 +12,31 @@ import ../../../../config/checks/config : requires ;
 using openssl ;
 import ac ;
 
+lib advapi32 ;
+lib crypt32 ;
+lib gdi32 ;
+lib user32 ;
+
 project
     : requirements
       [ requires
         cxx20_hdr_concepts
+        cxx20_hdr_format
       ]
       <library>/boost/http_io//boost_http_io
       [ ac.check-library /boost/rts//boost_rts_zlib : <library>/boost/rts//boost_rts_zlib : ]
       [ ac.check-library /boost/rts//boost_rts_brotli : <library>/boost/rts//boost_rts_brotli : ]
+      [ ac.check-library /openssl//ssl : <library>/openssl//ssl/<link>shared : <build>no ]
+      [ ac.check-library /openssl//crypto : <library>/openssl//crypto/<link>shared : <build>no ]
+      <target-os>windows:<library>advapi32
+      <target-os>windows:<library>crypt32
+      <target-os>windows:<library>gdi32
+      <target-os>windows:<library>user32
       <library>/boost/url//boost_url
       <library>/boost/program_options//boost_program_options
       <library>/boost/scope//boost_scope
-      <library>/openssl//ssl/<link>shared
-      <library>/openssl//crypto/<link>shared
-      <target-os>windows:<library>crypt32
       <include>.
+      <link>shared:<define>BOOST_PROGRAM_OPTIONS_DYN_LINK=1 # workaround Jamfile issue in program_options
     ;
 
 exe burl :

example/client/burl/main.cpp

@@ -751,7 +751,10 @@ retry(
 asio::awaitable<void>
 co_main(int argc, char* argv[])
 {
-    auto [oc, ssl_ctx, ropt_gen] = parse_args(argc, argv);
+    auto args_rs       = parse_args(argc, argv);
+    auto& oc           = args_rs.oc;
+    auto& ropt_gen     = args_rs.ropt_gen;
+    auto& ssl_ctx      = args_rs.ssl_ctx;
 
     auto executor      = co_await asio::this_coro::executor;
     auto task_group    = ::task_group{ executor, oc.parallel_max };

example/client/burl/options.cpp

@@ -783,7 +783,7 @@ parse_args(int argc, char* argv[])
                 if(!url.has_value())
                     return boost::optional<glob_result>{};
                 return boost::optional<glob_result>(
-                    { std::exchange(url, {}).value(), {} });
+                    glob_result{ std::exchange(url, {}).value(), {} });
             };
         };
 
@@ -830,11 +830,11 @@ parse_args(int argc, char* argv[])
             auto& request_info = requests.back();
             if(auto o = request_info.url_gen())
             {
-                return request_opt(
+                return request_opt{
                     o->result,
                     o->interpolate(request_info.output),
                     request_info.input,
-                    request_info.remotename);
+                    request_info.remotename };
             }
             requests.pop_back();
         }

example/client/burl/request.hpp

@@ -87,9 +87,9 @@ class async_request_op
                 return self.complete(ec);
 
             // TODO: use associated allocator
-            exp100_.reset(new exp100(
+            exp100_.reset(new exp100{
                 exp100::awaiting,
-                asio::steady_timer{ stream_.get_executor() }));
+                asio::steady_timer{ stream_.get_executor() } });
             exp100_->timer.expires_after(exp100_timeout_);
 
             BOOST_ASIO_CORO_YIELD

example/client/burl/task_group.hpp

@@ -30,7 +30,7 @@ enum class task_group_errc
 template<typename Executor>
 class basic_task_group
 {
-    asio::steady_timer::rebind_executor<Executor>::other cv_;
+    typename asio::steady_timer::rebind_executor<Executor>::other cv_;
     std::uint32_t max_;
     std::list<asio::cancellation_signal> css_;
 

example/client/get/Jamfile

@@ -10,15 +10,23 @@
 using openssl ;
 import ac ;
 
+lib advapi32 ;
+lib crypt32 ;
+lib gdi32 ;
+lib user32 ;
+
 project
     : requirements
       <library>/boost/http_io//boost_http_io
       [ ac.check-library /boost/rts//boost_rts_zlib : <library>/boost/rts//boost_rts_zlib : ]
       [ ac.check-library /boost/rts//boost_rts_brotli : <library>/boost/rts//boost_rts_brotli : ]
-      <library>/boost/url//boost_url
-      <library>/openssl//ssl/<link>shared
-      <library>/openssl//crypto/<link>shared
+      [ ac.check-library /openssl//ssl : <library>/openssl//ssl/<link>shared : <build>no ]
+      [ ac.check-library /openssl//crypto : <library>/openssl//crypto/<link>shared : <build>no ]
+      <target-os>windows:<library>advapi32
       <target-os>windows:<library>crypt32
+      <target-os>windows:<library>gdi32
+      <target-os>windows:<library>user32
+      <library>/boost/url//boost_url
       <include>.
     ;
 

example/client/jsonrpc/Jamfile

@@ -12,15 +12,24 @@ import ../../../../config/checks/config : requires ;
 using openssl ;
 import ac ;
 
+lib advapi32 ;
+lib crypt32 ;
+lib gdi32 ;
+lib user32 ;
+
 project
     : requirements
       <library>/boost/http_io//boost_http_io
-      <library>/boost/url//boost_url
+      [ ac.check-library /boost/rts//boost_rts_zlib : <library>/boost/rts//boost_rts_zlib : ]
+      [ ac.check-library /boost/rts//boost_rts_brotli : <library>/boost/rts//boost_rts_brotli : ]
+      [ ac.check-library /openssl//ssl : <library>/openssl//ssl/<link>shared : <build>no ]
+      [ ac.check-library /openssl//crypto : <library>/openssl//crypto/<link>shared : <build>no ]
+      <target-os>windows:<library>advapi32
+      <target-os>windows:<library>crypt32
+      <target-os>windows:<library>gdi32
+      <target-os>windows:<library>user32      <library>/boost/url//boost_url
       <library>/boost/json//boost_json
       <library>/boost/multiprecision//boost_multiprecision
-      <library>/openssl//ssl/<link>shared
-      <library>/openssl//crypto/<link>shared
-      <target-os>windows:<library>crypt32
       <include>.
     ;
 

example/server/CMakeLists.txt

@@ -28,3 +28,15 @@ target_link_libraries(http_io_server_example
     OpenSSL::SSL
     OpenSSL::Crypto
     )
+
+if (WIN32)
+    target_link_libraries(http_io_server_example crypt32)
+endif()
+
+if (TARGET Boost::rts_zlib)
+    target_link_libraries(http_io_server_example Boost::rts_zlib)
+endif()
+
+if (TARGET Boost::rts_brotli)
+    target_link_libraries(http_io_server_example Boost::rts_brotli)
+endif()

example/server/Jamfile

@@ -8,10 +8,26 @@
 # Official repository: https://github.com/CPPAlliance/http_proto
 #
 
+using openssl ;
+import ac ;
+
+lib advapi32 ;
+lib crypt32 ;
+lib gdi32 ;
+lib user32 ;
+
 project
     : requirements
       <library>/boost/http_io//boost_http_io
       <library>/boost/url//boost_url
+      [ ac.check-library /boost/rts//boost_rts_zlib : <library>/boost/rts//boost_rts_zlib : ]
+      [ ac.check-library /boost/rts//boost_rts_brotli : <library>/boost/rts//boost_rts_brotli : ]
+      [ ac.check-library /openssl//ssl : <library>/openssl//ssl/<link>shared : <build>no ]
+      [ ac.check-library /openssl//crypto : <library>/openssl//crypto/<link>shared : <build>no ]
+      <target-os>windows:<library>advapi32
+      <target-os>windows:<library>crypt32
+      <target-os>windows:<library>gdi32
+      <target-os>windows:<library>user32
       <include>.
     ;