chore: fix CI

Author: ashtum

.drone.star

@@ -13,21 +13,21 @@
 def main(ctx):
     return generate(
         # Compilers
-        ['gcc >=5.0',
-         'clang >=3.8',
-         'msvc >=14.1',
-         'arm64-gcc latest',
-         's390x-gcc latest',
-         'apple-clang *',
-         'arm64-clang latest',
-         's390x-clang latest',
-         # 'x86-msvc latest'
-         ],
+        [
+            'gcc >=5.0',
+            'clang >=3.8',
+            'msvc >=14.1',
+            'arm64-gcc latest',
+            's390x-gcc latest',
+            # 'freebsd-gcc latest',
+            'apple-clang *',
+            'arm64-clang latest',
+            's390x-clang latest',
+            # 'x86-msvc latest'
+        ],
         # Standards
         '>=11',
         packages=['zlib1g', 'zlib1g-dev'])
 
-
-# from https://github.com/boostorg/boost-ci
-load("@boost_ci//ci/drone/:functions.star", "linux_cxx", "windows_cxx", "osx_cxx", "freebsd_cxx")
-load("@url//:.drone.star", "generate")
+# from https://github.com/cppalliance/ci-automation
+load("@ci_automation//ci/drone/:functions.star", "linux_cxx", "windows_cxx", "osx_cxx", "freebsd_cxx", "generate")

.github/workflows/ci.yml

@@ -1121,7 +1121,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # - { name: Windows, os: windows-latest }
+          - { name: Windows, os: windows-latest }
           - { name: Ubuntu, os: ubuntu-latest }
           - { name: MacOS, os: macos-latest }
     name: Antora Docs (${{ matrix.name }})
@@ -1153,8 +1153,14 @@ jobs:
         with:
           branch: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }}
           boost-dir: boost-source
-          scan-modules-dir: http-proto-root
-          scan-modules-ignore: http_proto
+          cache: false
+          modules-exclude-paths: ''
+          scan-modules-dir: |
+            http-proto-root
+            buffers-root
+          scan-modules-ignore: |
+            http_proto
+            buffers
 
       - name: Patch Boost
         id: patch
@@ -1189,9 +1195,6 @@ jobs:
           cp -r "$workspace_root"/http-proto-root "libs/$module"
           cp -r "$workspace_root"/buffers-root libs/buffers
 
-          python3 tools/boostdep/depinst/depinst.py buffers
-          python3 tools/boostdep/depinst/depinst.py http_proto
-
       - uses: actions/setup-node@v4
         with:
           node-version: 18
@@ -1223,4 +1226,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: antora-docs-${{ matrix.name }}
-          path: doc/build/site
+          path: boost-root/libs/http_proto/doc/build/site

CMakeLists.txt

@@ -133,24 +133,30 @@ endif ()
 #
 #-------------------------------------------------
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
 file(GLOB_RECURSE BOOST_HTTP_PROTO_HEADERS CONFIGURE_DEPENDS include/boost/*.hpp include/boost/*.natvis)
 file(GLOB_RECURSE BOOST_HTTP_PROTO_SOURCES CONFIGURE_DEPENDS src/*.cpp src/*.hpp)
+file(GLOB_RECURSE BOOST_HTTP_PROTO_ZLIB_SOURCES CONFIGURE_DEPENDS src_zlib/*.cpp src_zlib/*.hpp)
+
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/include/boost PREFIX "" FILES ${BOOST_HTTP_PROTO_HEADERS})
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/src PREFIX "http_proto" FILES ${BOOST_HTTP_PROTO_SOURCES})
+source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/src_zlib PREFIX "http_proto" FILES ${BOOST_HTTP_PROTO_ZLIB_SOURCES})
+
 add_library(boost_http_proto ${BOOST_HTTP_PROTO_HEADERS} ${BOOST_HTTP_PROTO_SOURCES})
 add_library(Boost::http_proto ALIAS boost_http_proto)
 target_compile_features(boost_http_proto PUBLIC cxx_constexpr)
-target_compile_definitions(boost_http_proto PUBLIC BOOST_HTTP_PROTO_NO_LIB=1)
 target_include_directories(boost_http_proto PUBLIC "${PROJECT_SOURCE_DIR}/include")
 target_link_libraries(boost_http_proto PUBLIC ${BOOST_HTTP_PROTO_DEPENDENCIES})
-target_compile_definitions(boost_http_proto PUBLIC $<IF:$<BOOL:${BUILD_SHARED_LIBS}>,BOOST_HTTP_PROTO_DYN_LINK=1,BOOST_HTTP_PROTO_STATIC_LINK=1>)
+target_compile_definitions(boost_http_proto PUBLIC BOOST_HTTP_PROTO_NO_LIB)
 target_compile_definitions(boost_http_proto PRIVATE BOOST_HTTP_PROTO_SOURCE)
+if (BUILD_SHARED_LIBS)
+    target_compile_definitions(boost_http_proto PUBLIC BOOST_HTTP_PROTO_DYN_LINK)
+else ()
+    target_compile_definitions(boost_http_proto PUBLIC BOOST_HTTP_PROTO_STATIC_LINK)
+endif ()
 
 find_package(ZLIB)
-
 if (ZLIB_FOUND)
-    file(GLOB_RECURSE BOOST_HTTP_PROTO_ZLIB_SOURCES CONFIGURE_DEPENDS src_zlib/*.cpp src_zlib/*.hpp)
-    source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/src_zlib PREFIX "http_proto" FILES ${BOOST_HTTP_PROTO_ZLIB_SOURCES})
     add_library(boost_http_proto_zlib ${BOOST_HTTP_PROTO_HEADERS} ${BOOST_HTTP_PROTO_ZLIB_SOURCES})
     add_library(Boost::http_proto_zlib ALIAS boost_http_proto_zlib)
     target_link_libraries(boost_http_proto_zlib PUBLIC boost_http_proto)