Merge branch 'develop'

Author: Flamefire

.github/workflows/ci.yml

@@ -1,6 +1,6 @@
 # Copyright 2020-2021 Peter Dimov
 # Copyright 2021 Andrey Semashev
-# Copyright 2021-2025 Alexander Grund
+# Copyright 2021-2026 Alexander Grund
 # Copyright 2022 James E. King III
 #
 # Distributed under the Boost Software License, Version 1.0.
@@ -9,6 +9,9 @@
 ---
 name: CI
 
+permissions:
+  contents: write
+
 on:
   pull_request:
   push:

.github/workflows/ci_tests.yml

@@ -1,9 +1,12 @@
-# Copyright 2019 - 2025 Alexander Grund
+# Copyright 2019 - 2026 Alexander Grund
 # Distributed under the Boost Software License, Version 1.0.
 # https://www.boost.org/LICENSE_1_0.txt
 
 name: CI Tests
 
+permissions:
+  contents: write
+
 on:
   pull_request:
   push:
@@ -55,10 +58,10 @@ jobs:
       # Boost.Iostreams doesn't support VS 2022 until 1.69
       BOOST_VERSION: ${{ startsWith(matrix.generator, 'Visual Studio') && '1.69.0' || '1.66.0' }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
     - name: Sanity check version
       run: grep -E 'set\(_version [0-9]' CMakeLists.txt
-    - uses: actions/cache@v4
+    - uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
       id: cache-boost
       with:
         path: ${{env.DEP_DIR}}
@@ -72,7 +75,7 @@ jobs:
       run: echo "BOOST_ROOT=${DEP_DIR//\\/\/}/boost_${BOOST_VERSION//./_}" >> $GITHUB_ENV
 
     # Install Boost
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       if: matrix.standalone == 'Boost' && steps.cache-boost.outputs.cache-hit != 'true'
       with:
         repository: boostorg/boost
@@ -178,7 +181,7 @@ jobs:
   CreateDocuTest:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Create documentation
         run: |
             sudo apt-get install -y doxygen
@@ -187,9 +190,9 @@ jobs:
   CreateBoostDocuTest:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Fetch Boost.CI
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           repository: boostorg/boost-ci
           ref: master
@@ -206,8 +209,8 @@ jobs:
   CheckFormatting:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: DoozyX/clang-format-lint-action@v0.18
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: DoozyX/clang-format-lint-action@bcb4eb2cb0d707ee4f3e5cc3b456eb075f12cf73 # v0.20
         with:
           exclude: './doc'
           clangFormatVersion: 10

.github/workflows/release.yml

@@ -2,6 +2,9 @@
 # Distributed under the Boost Software License, Version 1.0.
 # https://www.boost.org/LICENSE_1_0.txt
 
+permissions:
+  contents: write
+
 on:
   push:
     tags:
@@ -14,12 +17,10 @@ jobs:
   release:
     name: Create Release
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
     env:
       DEP_DIR: ${{github.workspace}}/dependencies
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Extract tag name and matching commit on standalone branch
         id: get_tag
         run: |
@@ -33,18 +34,27 @@ jobs:
             echo "tag=v$version" >> $GITHUB_OUTPUT
             SOURCE_SHA=$(git rev-parse origin/develop)
           fi
-          SOURCE_SHA=$(git rev-parse --short "$SOURCE_SHA")
-          # Find matching standalone commit hash
-          standalone_commit_matches=$(git log origin/standalone --format="%H" --grep="^Source commit: $SOURCE_SHA\$")
-          if ! count=$(grep -c . <<<"$standalone_commit_matches"); then
+          standalone_commit=0
+          # Search standalone branch for last 10 more commits if the current one isn't found
+          for i in {0..10}; do
+            curSha=$(git rev-parse --short "${SOURCE_SHA}~${i}")
+            # Find matching standalone commit hash
+            standalone_commit_matches=$(git log origin/standalone --format="%H" --grep="^Source commit: $curSha\$")
+            if ! count=$(grep -c . <<<"$standalone_commit_matches"); then
+              echo "WARN: Did not found source commit for $curSha ($i)"
+            elif [[ $count -ne 1 ]]; then
+              echo "ERROR: Found more than 1 related commit for $curSha ($i): $standalone_commit_matches"
+              exit
+            else
+              standalone_commit=$curSha
+            fi
+          done;
+          if [[ $standalone_commit == "0" ]]; then
             echo "ERROR: Did not found source commit for $SOURCE_SHA"
             exit 1
-          elif [[ $count -ne 1 ]]; then
-            echo "ERROR: Found more than 1 related commit: $standalone_commit_matches"
-            exit 1
           fi
           echo "source_commit=$SOURCE_SHA" >> $GITHUB_OUTPUT
-          echo "standalone_commit=$standalone_commit_matches" >> $GITHUB_OUTPUT
+          echo "standalone_commit=$standalone_commit" >> $GITHUB_OUTPUT
       - name: Sanity check version
         run: |
           version=${{steps.get_tag.outputs.tag}}
@@ -110,7 +120,7 @@ jobs:
           version=${{steps.get_tag.outputs.tag}}
           tag_name=standalone-$version
           git tag -a "$tag_name" "${{steps.get_tag.outputs.standalone_commit}}" \
-            -m "Standalone version for v$version" \
+            -m "Standalone version for $version" \
             -m "Source-Commit: ${{steps.get_tag.outputs.source_commit}}"
           git show "$tag_name"
           if [[ "{{github.event_name}}" == "push" ]]; then
@@ -119,7 +129,7 @@ jobs:
 
       - name: Create Release
         if: github.event_name == 'push'
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.github/workflows/update_standalone.yml

@@ -2,6 +2,9 @@
 # Distributed under the Boost Software License, Version 1.0.
 # https://www.boost.org/LICENSE_1_0.txt
 
+permissions:
+  contents: write
+
 on:
   push:
     branches: [develop]
@@ -16,7 +19,7 @@ jobs:
     name: Update standalone branch
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Setup git
         run: |
             git config --global user.email "$GITHUB_ACTOR@users.noreply.github.com"

test/test_iostream.cpp

@@ -491,9 +491,9 @@ class RedirectStdio
 void test_console()
 {
 #ifdef __MINGW32__
-    bool isMinGW_CI = std::getenv("CI");
+    const bool isMinGW_CI = std::getenv("CI");
 #else
-    bool isMinGW_CI = false;
+    const bool isMinGW_CI = false;
 #endif
 #ifndef BOOST_NOWIDE_DISABLE_CIN_TEST
     std::cout << "Test cin console: " << std::flush;
@@ -557,7 +557,10 @@ void test_console()
         cerr << testString << std::flush;
 
         const auto data = stderrHandle.getBufferData();
-        TEST_EQ(data, nw::widen(testString));
+        if(isMinGW_CI && data.empty())
+            std::cout << "WARNING: MinGW CI issue detected, skipping part of test"; // LCOV_EXCL_LINE
+        else
+            TEST_EQ(data, nw::widen(testString));
     }
     std::cout << "Console tests done" << std::endl;
 }