Update ci.yml

Update .drone.jsonnet
Merge pull request #136 from vinniefalco/develop
2025-12-27 09:18:15 +01:00 · 2025-11-30 21:15:05 +02:00 · 2025-11-02 20:08:38 +02:00 · 2025-11-02 20:04:15 +02:00 · 2025-11-02 09:18:54 -08:00 · 2025-10-29 15:44:52 +02:00
9 changed files with 159 additions and 152 deletions
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -34,7 +34,6 @@ local linux_pipeline(name, image, environment, packages = "", sources = [], arch
                'set -e',
                'uname -a',
                'echo $DRONE_STAGE_MACHINE',
-                'wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -',
            ] +
            (if sources != [] then [ ('apt-add-repository "' + source + '"') for source in sources ] else []) +
            (if packages != "" then [ 'apt-get update', 'apt-get -y install ' + packages ] else []) +
@@ -205,22 +204,22 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
    ),

    linux_pipeline(
-        "Linux 23.04 GCC 13 32 UBSAN",
-        "cppalliance/droneubuntu2304:1",
+        "Linux 24.04 GCC 13 32 UBSAN",
+        "cppalliance/droneubuntu2404:1",
        { TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '32' } + ubsan,
        "g++-13-multilib",
    ),

    linux_pipeline(
-        "Linux 23.04 GCC 13 64 UBSAN",
-        "cppalliance/droneubuntu2304:1",
+        "Linux 24.04 GCC 13 64 UBSAN",
+        "cppalliance/droneubuntu2404:1",
        { TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '64' } + ubsan,
        "g++-13-multilib",
    ),

    linux_pipeline(
-        "Linux 23.04 GCC 13 32 ASAN",
-        "cppalliance/droneubuntu2304:1",
+        "Linux 24.04 GCC 13 32 ASAN",
+        "cppalliance/droneubuntu2404:1",
        { TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '32' } + asan,
        "g++-13-multilib",
    ),
@@ -239,6 +238,20 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
        "g++-14-multilib",
    ),

+    linux_pipeline(
+        "Linux 25.04 GCC 15 UBSAN",
+        "cppalliance/droneubuntu2504:1",
+        { TOOLSET: 'gcc', COMPILER: 'g++-15', CXXSTD: '11,14,17,20,23,2c' } + ubsan,
+        "g++-15-multilib",
+    ),
+
+    linux_pipeline(
+        "Linux 25.04 GCC 15 ASAN",
+        "cppalliance/droneubuntu2504:1",
+        { TOOLSET: 'gcc', COMPILER: 'g++-15', CXXSTD: '11,14,17,20,23,2c' } + asan,
+        "g++-15-multilib",
+    ),
+
    linux_pipeline(
        "Linux 16.04 Clang 3.5",
        "cppalliance/droneubuntu1604:1",
@@ -289,15 +302,15 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
    ),

    linux_pipeline(
-        "Linux 23.04 Clang 16",
-        "cppalliance/droneubuntu2304:1",
+        "Linux 24.04 Clang 16",
+        "cppalliance/droneubuntu2404:1",
        { TOOLSET: 'clang', COMPILER: 'clang++-16', CXXSTD: '11,14,17,20,2b' },
        "clang-16",
    ),

    linux_pipeline(
-        "Linux 23.10 Clang 17",
-        "cppalliance/droneubuntu2310:1",
+        "Linux 24.04 Clang 17",
+        "cppalliance/droneubuntu2404:1",
        { TOOLSET: 'clang', COMPILER: 'clang++-17', CXXSTD: '11,14,17,20,2b' },
        "clang-17",
    ),
@@ -316,6 +329,34 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
        "clang-18",
    ),

+    linux_pipeline(
+        "Linux 24.04 Clang 19 UBSAN",
+        "cppalliance/droneubuntu2404:1",
+        { TOOLSET: 'clang', COMPILER: 'clang++-19', CXXSTD: '11,14,17,20,2b' } + ubsan,
+        "clang-19",
+    ),
+
+    linux_pipeline(
+        "Linux 24.04 Clang 19 ASAN",
+        "cppalliance/droneubuntu2404:1",
+        { TOOLSET: 'clang', COMPILER: 'clang++-19', CXXSTD: '11,14,17,20,2b' } + asan,
+        "clang-19",
+    ),
+
+    linux_pipeline(
+        "Linux 24.04 Clang 20 UBSAN",
+        "cppalliance/droneubuntu2404:1",
+        { TOOLSET: 'clang', COMPILER: 'clang++-20', CXXSTD: '11,14,17,20,23,2c' } + ubsan,
+        "clang-20",
+    ),
+
+    linux_pipeline(
+        "Linux 24.04 Clang 20 ASAN",
+        "cppalliance/droneubuntu2404:1",
+        { TOOLSET: 'clang', COMPILER: 'clang++-20', CXXSTD: '11,14,17,20,23,2c' } + asan,
+        "clang-20",
+    ),
+
    macos_pipeline(
        "MacOS 10.15 Xcode 12.2 UBSAN",
        { TOOLSET: 'clang', COMPILER: 'clang++', CXXSTD: '11,14,1z' } + ubsan,
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,33 +19,36 @@ jobs:
        include:
          - toolset: gcc-4.8
            cxxstd: "11"
-            os: ubuntu-latest
            container: ubuntu:18.04
+            os: ubuntu-latest
            install: g++-4.8
          - toolset: gcc-5
            cxxstd: "11,14,1z"
-            os: ubuntu-latest
            container: ubuntu:18.04
+            os: ubuntu-latest
            install: g++-5
          - toolset: gcc-6
            cxxstd: "11,14,1z"
-            os: ubuntu-latest
            container: ubuntu:18.04
+            os: ubuntu-latest
            install: g++-6
          - toolset: gcc-7
            cxxstd: "11,14,17"
-            os: ubuntu-latest
            container: ubuntu:18.04
+            os: ubuntu-latest
          - toolset: gcc-8
            cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
            install: g++-8
          - toolset: gcc-9
            cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
          - toolset: gcc-10
            cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
            install: g++-10
          - toolset: gcc-11
            cxxstd: "11,14,17,2a"
@@ -57,13 +60,18 @@ jobs:
          - toolset: gcc-13
            cxxstd: "11,14,17,20,2b"
            os: ubuntu-latest
-            container: ubuntu:23.04
+            container: ubuntu:24.04
            install: g++-13
          - toolset: gcc-14
            cxxstd: "11,14,17,20,2b"
            os: ubuntu-latest
            container: ubuntu:24.04
            install: g++-14
+          - toolset: gcc-15
+            cxxstd: "11,14,17,20,23,2c"
+            os: ubuntu-latest
+            container: ubuntu:25.04
+            install: g++-15
          - toolset: clang
            compiler: clang++-3.9
            cxxstd: "11,14"
@@ -85,35 +93,45 @@ jobs:
          - toolset: clang
            compiler: clang++-6.0
            cxxstd: "11,14,17"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
            install: clang-6.0
          - toolset: clang
            compiler: clang++-7
            cxxstd: "11,14,17"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
            install: clang-7
          - toolset: clang
            compiler: clang++-8
            cxxstd: "11,14,17"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
            install: clang-8
          - toolset: clang
            compiler: clang++-9
            cxxstd: "11,14,17"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
            install: clang-9
          - toolset: clang
            compiler: clang++-10
            cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
+            install: clang-10
          - toolset: clang
            compiler: clang++-11
            cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
+            install: clang-11
          - toolset: clang
            compiler: clang++-12
            cxxstd: "11,14,17,20"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
+            install: clang-12
          - toolset: clang
            compiler: clang++-13
            cxxstd: "11,14,17,20,2b"
@@ -135,13 +153,13 @@ jobs:
          - toolset: clang
            compiler: clang++-16
            cxxstd: "11,14,17,20,2b"
-            container: ubuntu:23.04
+            container: ubuntu:24.04
            os: ubuntu-latest
            install: clang-16
          - toolset: clang
            compiler: clang++-17
            cxxstd: "11,14,17,20,2b"
-            container: ubuntu:23.10
+            container: ubuntu:24.04
            os: ubuntu-latest
            install: clang-17
          - toolset: clang
@@ -151,34 +169,60 @@ jobs:
            os: ubuntu-latest
            install: clang-18
          - toolset: clang
+            compiler: clang++-19
            cxxstd: "11,14,17,20,2b"
-            os: macos-12
+            container: ubuntu:24.04
+            os: ubuntu-latest
+            install: clang-19
          - toolset: clang
-            cxxstd: "11,14,17,20,2b"
-            os: macos-13
+            compiler: clang++-20
+            cxxstd: "11,14,17,20,23,2c"
+            container: ubuntu:24.04
+            os: ubuntu-latest
+            install: clang-20
+          - toolset: clang
+            compiler: clang++-21
+            cxxstd: "11,14,17,20,23,2c"
+            container: ubuntu:25.10
+            os: ubuntu-latest
+            install: clang-21
          - toolset: clang
            cxxstd: "11,14,17,20,2b"
            os: macos-14
+          - toolset: clang
+            cxxstd: "11,14,17,20,2b"
+            os: macos-15
+          - toolset: clang
+            cxxstd: "11,14,17,20,23,2c"
+            os: macos-26

    runs-on: ${{matrix.os}}
-    container: ${{matrix.container}}
+
+    container:
+      image: ${{matrix.container}}
+      volumes:
+        - /node20217:/node20217:rw,rshared
+        - ${{ startsWith(matrix.container, 'ubuntu:1') && '/node20217:/__e/node20:ro,rshared' || ' ' }}

    defaults:
      run:
        shell: bash

    steps:
-      - name: Enable Node 16
-        run: |
-          echo "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true" >> $GITHUB_ENV
-
-      - uses: actions/checkout@v3
-
      - name: Setup container environment
        if: matrix.container
        run: |
          apt-get update
-          apt-get -y install sudo python3 git g++
+          apt-get -y install sudo python3 git g++ curl xz-utils
+
+      - name: Install nodejs20glibc2.17
+        if: ${{ startsWith( matrix.container, 'ubuntu:1' ) }}
+        run: |
+          curl -LO https://archives.boost.io/misc/node/node-v20.9.0-linux-x64-glibc-217.tar.xz
+          tar -xf node-v20.9.0-linux-x64-glibc-217.tar.xz --strip-components 1 -C /node20217
+          ldd /__e/node20/bin/node
+
+      - uses: actions/checkout@v4

      - name: Install packages
        if: matrix.install
@@ -223,14 +267,6 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - toolset: msvc-14.0
-            cxxstd: "14"
-            addrmd: 32,64
-            os: windows-2019
-          - toolset: msvc-14.2
-            cxxstd: "14,17,20,latest"
-            addrmd: 32,64
-            os: windows-2019
          - toolset: msvc-14.3
            cxxstd: "14,17,20,latest"
            addrmd: 32,64
@@ -242,7 +278,7 @@ jobs:
          - toolset: gcc
            cxxstd: "11,14,17,2a"
            addrmd: 64
-            os: windows-2019
+            os: windows-2022

    runs-on: ${{matrix.os}}

@@ -282,11 +318,8 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - os: ubuntu-20.04
-          - os: ubuntu-22.04
-          - os: macos-12
-          - os: macos-13
-          - os: macos-14
+          - os: ubuntu-latest
+          - os: macos-latest

    runs-on: ${{matrix.os}}

@@ -330,11 +363,8 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - os: ubuntu-20.04
-          - os: ubuntu-22.04
-          - os: macos-12
-          - os: macos-13
-          - os: macos-14
+          - os: ubuntu-latest
+          - os: macos-latest

    runs-on: ${{matrix.os}}

@@ -388,11 +418,8 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - os: ubuntu-20.04
-          - os: ubuntu-22.04
-          - os: macos-12
-          - os: macos-13
-          - os: macos-14
+          - os: ubuntu-latest
+          - os: macos-latest

    runs-on: ${{matrix.os}}

@@ -444,8 +471,7 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - os: windows-2019
-          - os: windows-2022
+          - os: windows-latest

    runs-on: ${{matrix.os}}

@@ -493,8 +519,7 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - os: windows-2019
-          - os: windows-2022
+          - os: windows-latest

    runs-on: ${{matrix.os}}

@@ -560,8 +585,7 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - os: windows-2019
-          - os: windows-2022
+          - os: windows-latest

    runs-on: ${{matrix.os}}

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,7 @@ target_link_libraries(boost_system

 target_compile_features(boost_system INTERFACE cxx_std_11)

-if(CMAKE_VERSION VERSION_GREATER 3.18 AND CMAKE_GENERATOR MATCHES "Visual Studio")
+if(NOT CMAKE_VERSION VERSION_LESS 3.19 AND CMAKE_GENERATOR MATCHES "Visual Studio")

  file(GLOB_RECURSE boost_system_IDEFILES CONFIGURE_DEPENDS include/*.hpp)
  source_group(TREE ${PROJECT_SOURCE_DIR}/include FILES ${boost_system_IDEFILES} PREFIX "Header Files")
--- a/build.jam
+++ b/build.jam
@@ -16,10 +16,9 @@ constant boost_dependencies :
 project /boost/system ;

 explicit
-    [ alias boost_system : build//boost_system ]
+    [ alias boost_system : : : : <include>include <library>$(boost_dependencies) ]
    [ alias all : boost_system test ]
    ;

 call-if : boost-library system
-    : install boost_system
    ;
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -1,20 +0,0 @@
-# Boost System Library Build Jamfile
-# Copyright 2002, 2006 Beman Dawes
-# Copyright 2024 Peter Dimov
-# Distributed under the Boost Software License, Version 1.0.
-# https://www.boost.org/LICENSE_1_0.txt
-
-# See library home page at https://www.boost.org/libs/system
-
-project
-    : common-requirements
-      <include>../include
-      <library>$(boost_dependencies)
-      <link>shared:<define>BOOST_SYSTEM_DYN_LINK=1
-      <link>static:<define>BOOST_SYSTEM_STATIC_LINK=1
-      <define>BOOST_SYSTEM_NO_LIB=1
-    ;
-
-SOURCES = error_code ;
-
-lib boost_system : ../src/$(SOURCES).cpp ;
--- a/doc/system/changes.adoc
+++ b/doc/system/changes.adoc
@@ -8,6 +8,15 @@ https://www.boost.org/LICENSE_1_0.txt
 # Revision History
 :idprefix:

+## Changes in Boost 1.89
+
+* The stub compiled library has been removed; System has been header-only since release 1.69.
+
+This may affect `CMakeLists.txt` files containing `find_package(Boost COMPONENTS system ...)`.
+The easiest fix is to just remove `system` from the list of components as it's no longer required.
+If compatibility with Boost releases earlier than 1.69 is to be preserved, one can use
+`find_package(Boost COMPONENTS ... OPTIONAL_COMPONENTS system)`.
+
 ## Changes in Boost 1.86

 * Support `result<T> & fv`, where `fv` returns `void`.
--- a/extra/boost_system.natvis
+++ b/extra/boost_system.natvis
@@ -12,10 +12,10 @@
    <Type Name="boost::system::error_code">
        <DisplayString Condition="lc_flags_ == 0">{d1_.val_} [system] ✓</DisplayString>

-        <DisplayString Condition="lc_flags_ == 1 &amp;&amp; ((std::error_code*)d2_)->_Mycat->_Addr==1">{((std::error_code*)d2_)->_Myval} [std:future]</DisplayString>
-        <DisplayString Condition="lc_flags_ == 1 &amp;&amp; ((std::error_code*)d2_)->_Mycat->_Addr==3">{((std::error_code*)d2_)->_Myval} [std:generic]</DisplayString>
-        <DisplayString Condition="lc_flags_ == 1 &amp;&amp; ((std::error_code*)d2_)->_Mycat->_Addr==5">{((std::error_code*)d2_)->_Myval} [std:iostream]</DisplayString>
-        <DisplayString Condition="lc_flags_ == 1 &amp;&amp; ((std::error_code*)d2_)->_Mycat->_Addr==7">{((std::error_code*)d2_)->_Myval} [std:system]</DisplayString>
+        <DisplayString Condition="lc_flags_ == 1 &amp;&amp; ((std::error_code*)d2_)->_Mycat->_Addr._Num==1">{((std::error_code*)d2_)->_Myval} [std:future]</DisplayString>
+        <DisplayString Condition="lc_flags_ == 1 &amp;&amp; ((std::error_code*)d2_)->_Mycat->_Addr._Num==3">{((std::error_code*)d2_)->_Myval} [std:generic]</DisplayString>
+        <DisplayString Condition="lc_flags_ == 1 &amp;&amp; ((std::error_code*)d2_)->_Mycat->_Addr._Num==5">{((std::error_code*)d2_)->_Myval} [std:iostream]</DisplayString>
+        <DisplayString Condition="lc_flags_ == 1 &amp;&amp; ((std::error_code*)d2_)->_Mycat->_Addr._Num==7">{((std::error_code*)d2_)->_Myval} [std:system]</DisplayString>
        <DisplayString Condition="lc_flags_ == 1">{((std::error_code*)d2_)->_Myval} std@{((uintptr_t)((std::error_code*)d2_)->_Mycat),x}</DisplayString>

        <DisplayString Condition="d1_.cat_->id_ == 0xb2ab117a257edfd0 &amp;&amp;
--- a/include/boost/system/result.hpp
+++ b/include/boost/system/result.hpp
@@ -332,40 +332,28 @@ public:

    BOOST_CXX14_CONSTEXPR T& operator*() noexcept
    {
-        T* p = operator->();
-
-        BOOST_ASSERT( p != 0 );
-
-        return *p;
+        BOOST_ASSERT( has_value() );
+        return *operator->();
    }

    BOOST_CXX14_CONSTEXPR T const& operator*() const noexcept
    {
-        T const* p = operator->();
-
-        BOOST_ASSERT( p != 0 );
-
-        return *p;
+        BOOST_ASSERT( has_value() );
+        return *operator->();
    }

 #else

    BOOST_CXX14_CONSTEXPR T& operator*() & noexcept
    {
-        T* p = operator->();
-
-        BOOST_ASSERT( p != 0 );
-
-        return *p;
+        BOOST_ASSERT( has_value() );
+        return *operator->();
    }

    BOOST_CXX14_CONSTEXPR T const& operator*() const & noexcept
    {
-        T const* p = operator->();
-
-        BOOST_ASSERT( p != 0 );
-
-        return *p;
+        BOOST_ASSERT( has_value() );
+        return *operator->();
    }

    template<class U = T>
@@ -838,11 +826,8 @@ public:

    BOOST_CXX14_CONSTEXPR U& operator*() const noexcept
    {
-        U* p = operator->();
-
-        BOOST_ASSERT( p != 0 );
-
-        return *p;
+        BOOST_ASSERT( has_value() );
+        return *operator->();
    }

    // error access
--- a/src/error_code.cpp
+++ b/src/error_code.cpp
@@ -1,31 +0,0 @@
-//  error_code stub implementation, for compatibility only
-
-//  Copyright Beman Dawes 2002, 2006
-//  Copyright Peter Dimov 2018
-
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-//  See library home page at http://www.boost.org/libs/system
-
-//----------------------------------------------------------------------------//
-
-// define BOOST_SYSTEM_SOURCE so that <boost/system/config.hpp> knows
-// the library is being built (possibly exporting rather than importing code)
-#define BOOST_SYSTEM_SOURCE
-
-#include <boost/system/config.hpp>
-
-namespace boost
-{
-
-namespace system
-{
-
-BOOST_SYSTEM_DECL void dummy_exported_function()
-{
-}
-
-} // namespace system
-
-} // namespace boost
Author	SHA1	Message	Date
Peter Dimov	6dc7819c2e	Update ci.yml	2025-11-30 21:15:05 +02:00
Peter Dimov	1061db7dcd	Update .drone.jsonnet	2025-11-02 20:08:38 +02:00
Peter Dimov	fa51e42fff	Merge pull request #136 from vinniefalco/develop chore: natvis uses correct layout for std::error_code	2025-11-02 20:04:15 +02:00
Vinnie Falco	323c618f99	chore: natvis uses correct layout for std::error_code fix #135	2025-11-02 09:18:54 -08:00
Peter Dimov	1a3279d087	Update release notes for 1.89 (better late than never)	2025-10-29 15:44:52 +02:00
Peter Dimov	bd46fb21f3	Correct CMake version check; VERSION_GREATER 3.18 is true for 3.18.1	2025-10-19 21:04:45 +03:00
Peter Dimov	14c5f52602	Remove windows-2019 from ci.yml	2025-07-02 19:12:29 +03:00
Peter Dimov	7a495bb46d	Switch Boost.System to header-only in b2	2025-06-26 16:37:21 +03:00
Peter Dimov	db00e1848e	Update ci.yml	2025-06-26 15:59:21 +03:00
Peter Dimov	7a49a5d80d	Change assertions in operator* to match documentation; improves codegen slightly in the result<U&> case	2025-02-24 19:46:43 +02:00
Peter Dimov	a0597f4872	Update .drone.jsonnet	2024-12-14 11:02:33 +02:00
Peter Dimov	485be93281	Apply Node20 workaround	2024-12-14 11:01:15 +02:00
Peter Dimov	ee0b15efc4	Update ci.yml	2024-12-14 11:00:28 +02:00