Merge remote-tracking branch 'upstream/develop' into patch-9

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 
@@ -58,7 +58,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 
@@ -96,7 +96,7 @@ jobs:
     timeout-minutes: 20
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 
@@ -126,7 +126,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 
@@ -155,7 +155,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 
@@ -189,7 +189,7 @@ jobs:
     timeout-minutes: 90
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 
@@ -219,7 +219,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 

.github/workflows/release-cmake.yml

@@ -0,0 +1,131 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - boost-*
+
+jobs:
+  release-posix-cmake:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: ${{ github.ref_name }}
+          submodules: true
+
+      - name: Cleanup
+        shell: bash
+        run: |
+          find ${{ github.ref_name }} -name ".git" -prune -exec rm -rf {} +
+
+      - name: Create archives
+        run: |
+          tar -czf ${{ github.ref_name }}-cmake.tar.gz ${{ github.ref_name }}
+          tar -cJf ${{ github.ref_name }}-cmake.tar.xz ${{ github.ref_name }}
+
+      - uses: softprops/action-gh-release@v1
+        with:
+          files: |
+            ${{ github.ref_name }}-cmake.tar.gz
+            ${{ github.ref_name }}-cmake.tar.xz
+
+  release-windows-cmake:
+    runs-on: windows-latest
+
+    needs: release-posix-cmake
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: ${{ github.ref_name }}
+          submodules: true
+
+      - name: Cleanup
+        shell: bash
+        run: |
+          find ${{ github.ref_name }} -name ".git" -prune -exec rm -rf {} +
+
+      - name: Create archives
+        shell: cmd
+        run: |
+          7z a ${{ github.ref_name }}-cmake.zip ${{ github.ref_name }}
+          7z a ${{ github.ref_name }}-cmake.7z ${{ github.ref_name }}
+
+      - uses: softprops/action-gh-release@v1
+        with:
+          files: |
+            ${{ github.ref_name }}-cmake.zip
+            ${{ github.ref_name }}-cmake.7z
+
+  release-posix-b2-nodocs:
+    runs-on: ubuntu-latest
+
+    needs: release-windows-cmake
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: ${{ github.ref_name }}
+          submodules: true
+
+      - name: Cleanup
+        shell: bash
+        run: |
+          find ${{ github.ref_name }} -name ".git" -prune -exec rm -rf {} +
+
+      - name: Move headers
+        shell: bash
+        run: |
+          cd ${{ github.ref_name }}
+          cp -r libs/*/include/boost libs/numeric/*/include/boost .
+          rm -rf libs/*/include libs/numeric/*/include
+          rm -f CMakeLists.txt
+
+      - name: Create archives
+        run: |
+          tar -czf ${{ github.ref_name }}-b2-nodocs.tar.gz ${{ github.ref_name }}
+          tar -cJf ${{ github.ref_name }}-b2-nodocs.tar.xz ${{ github.ref_name }}
+
+      - uses: softprops/action-gh-release@v1
+        with:
+          files: |
+            ${{ github.ref_name }}-b2-nodocs.tar.gz
+            ${{ github.ref_name }}-b2-nodocs.tar.xz
+
+  release-windows-b2-nodocs:
+    runs-on: windows-latest
+
+    needs: release-posix-b2-nodocs
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: ${{ github.ref_name }}
+          submodules: true
+
+      - name: Cleanup
+        shell: bash
+        run: |
+          find ${{ github.ref_name }} -name ".git" -prune -exec rm -rf {} +
+
+      - name: Move headers
+        shell: bash
+        run: |
+          cd ${{ github.ref_name }}
+          cp -r libs/*/include/boost libs/numeric/*/include/boost .
+          rm -rf libs/*/include libs/numeric/*/include
+          rm -f CMakeLists.txt
+
+      - name: Create archives
+        shell: cmd
+        run: |
+          7z a ${{ github.ref_name }}-b2-nodocs.zip ${{ github.ref_name }}
+          7z a ${{ github.ref_name }}-b2-nodocs.7z ${{ github.ref_name }}
+
+      - uses: softprops/action-gh-release@v1
+        with:
+          files: |
+            ${{ github.ref_name }}-b2-nodocs.zip
+            ${{ github.ref_name }}-b2-nodocs.7z

.gitmodules

@@ -818,3 +818,13 @@
 	url = ../cobalt.git
 	fetchRecurseSubmodules = on-demand
 	branch = .
+[submodule "charconv"]
+	path = libs/charconv
+	url = ../charconv.git
+	fetchRecurseSubmodules = on-demand
+	branch = .
+[submodule "scope"]
+	path = libs/scope
+	url = ../scope.git
+	fetchRecurseSubmodules = on-demand
+	branch = .

CMakeLists.txt

@@ -10,7 +10,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND NOT CMAKE_BUILD_TYPE A
   set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
 endif()
 
-project(Boost VERSION 1.85.0 LANGUAGES CXX)
+project(Boost VERSION 1.86.0 LANGUAGES CXX)
 
 set(BOOST_SUPERPROJECT_VERSION ${PROJECT_VERSION})
 set(BOOST_SUPERPROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR})

Jamroot

@@ -176,8 +176,7 @@ if $(all-headers)
 project /boost
     : requirements <include>.
 
-      [ boostcpp.architecture ]
-      [ boostcpp.address-model ]
+      [ boostcpp.platform ]
 
       # Disable auto-linking for all targets here, primarily because it caused
       # troubles with V2.