Merge branch 'master' of https://github.com/approvals/ApprovalTests.cpp

Author: isidore

.github/workflows/cygwin.yml

@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Cygwin
-        uses: cygwin/cygwin-install-action@v4
+        uses: cygwin/cygwin-install-action@v6
         with:
           packages: cmake libboost-devel libtool gcc-g++ binutils make
 

.github/workflows/github_actions_build.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
-      - uses: DoozyX/clang-format-lint-action@v0.17
+      - uses: DoozyX/clang-format-lint-action@v0.20
         with:
           source: '.'
           exclude: './third_party'
@@ -130,7 +130,7 @@ jobs:
       CXX: ${{ matrix.cxx-compiler }}
     steps:
       - uses: actions/checkout@master
-      - uses: seanmiddleditch/gha-setup-ninja@v4
+      - uses: seanmiddleditch/gha-setup-ninja@v6
         if: contains(matrix.generator, 'Ninja')
 
       - name: install boost
@@ -175,7 +175,7 @@ jobs:
       DEVELOPER_DIR: '/Applications/Xcode_${{ matrix.xcode-version }}.app/Contents/Developer'
     steps:
       - uses: actions/checkout@master
-      - uses: seanmiddleditch/gha-setup-ninja@v4
+      - uses: seanmiddleditch/gha-setup-ninja@v6
         if: contains(matrix.generator, 'Ninja')
 
       - name: install boost
@@ -192,13 +192,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - job-name: WIN-2025-VS-2019
+          - job-name: WIN-2025-VS-2022
             os-version: '2025'
-            generator: '"Visual Studio 16 2019"'
+            generator: '"Visual Studio 17 2022"'
 
-          - job-name: WIN-2025-VS-2019 (clangcl)
+          - job-name: WIN-2025-VS-2022 (clangcl)
             os-version: '2025'
-            generator: '"Visual Studio 16 2019" -T "clangcl"'
+            generator: '"Visual Studio 17 2022" -T "clangcl"'
 
           - job-name: WIN-latest-VS-2022
             os-version: 'latest'
@@ -244,3 +244,20 @@ jobs:
         run: |
           cd ${{ env.BUILD_PATH }}
           ctest --verbose --output-on-failure -C Debug
+
+  auto-merge:
+    needs: [Linux, macOS, Windows]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repo
+        uses: actions/checkout@v4
+      - name: auto-merge
+        if: |
+          github.actor == 'dependabot[bot]' &&
+          github.event_name == 'pull_request'
+        run: |
+          gh pr merge --auto --rebase "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          # this secret needs to be in the settings.secrets.dependabot
+          GITHUB_TOKEN: ${{secrets.GH_ACTION_TOKEN}}

ApprovalTests/integrations/catch/Catch2Approvals.h

@@ -48,7 +48,10 @@ struct Catch2ApprovalListener : Catch::TestEventListenerBase
 
     virtual void sectionEnded(Catch::SectionStats const& /*sectionStats*/) override
     {
-        currentTest.sections.pop_back();
+        if (!currentTest.sections.empty())
+        {
+            currentTest.sections.pop_back();
+        }
     }
 };
 //}

ApprovalTests/integrations/fmt/FmtToString.h

@@ -1,13 +1,15 @@
 #pragma once
 #ifdef FMT_VERSION
+
+#include <fmt/format.h> // for fmt::to_string()
+
 namespace ApprovalTests
 {
     class FmtToString
     {
     public:
         template <typename T> static std::string toString(const T& printable)
         {
-            (void)printable;
             return fmt::to_string(printable);
         }
     };

doc/CMakeIntegration.md

@@ -264,7 +264,7 @@ It also needs CMake 3.14 or above.
 We use this in our `CMakeLists.txt` file:
 
 <!-- snippet: cpm_download -->
-<a id='snippet-cpm_download'></a>
+<a id='snippet-https://raw.githubusercontent.com/Laguna1989/OpenALpp/master/ext/CMakeLists.txt%23cpm_download'></a>
 ```txt
 message(STATUS "Add CPM.cmake")
 # download CPM.cmake
@@ -276,11 +276,11 @@ file(
 )
 include(${CMAKE_BINARY_DIR}/cmake/CPM.cmake)
 ```
-<sup><a href='#snippet-cpm_download' title='Start of snippet'>anchor</a></sup>
+<sup><a href='https://raw.githubusercontent.com/Laguna1989/OpenALpp/master/ext/CMakeLists.txt#cpm_download' title='Snippet source file'>anchor</a></sup>
 <!-- endSnippet -->
 
 <!-- snippet: cpm_add_approvaltests -->
-<a id='snippet-cpm_add_approvaltests'></a>
+<a id='snippet-https://raw.githubusercontent.com/Laguna1989/OpenALpp/master/ext/CMakeLists.txt%23cpm_add_approvaltests'></a>
 ```txt
 message(STATUS "Fetching approvaltests")
 CPMAddPackage(
@@ -289,7 +289,7 @@ CPMAddPackage(
         GIT_TAG master
 )
 ```
-<sup><a href='#snippet-cpm_add_approvaltests' title='Start of snippet'>anchor</a></sup>
+<sup><a href='https://raw.githubusercontent.com/Laguna1989/OpenALpp/master/ext/CMakeLists.txt#cpm_add_approvaltests' title='Snippet source file'>anchor</a></sup>
 <!-- endSnippet -->
 
 Note the `GIT_TAG` values: This tells CMake which revision of dependencies to use. The value can be a tag or a git commit ID. Here we use `master`. However, it is generally recommended to pin your dependencies to specific versions, and test behaviour before updating to newer versions.