Skip to content

Commit a507af4

Browse files
committed
Merge branch 'master' of github.com:approvals/ApprovalTests.cpp
2 parents 25e8bbe + 5f95a1e commit a507af4

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

.github/workflows/cygwin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: actions/checkout@v4
2121

2222
- name: Set up Cygwin
23-
uses: cygwin/cygwin-install-action@v4
23+
uses: cygwin/cygwin-install-action@v6
2424
with:
2525
packages: cmake libboost-devel libtool gcc-g++ binutils make
2626

.github/workflows/github_actions_build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@master
14-
- uses: DoozyX/clang-format-lint-action@v0.17
14+
- uses: DoozyX/clang-format-lint-action@v0.20
1515
with:
1616
source: '.'
1717
exclude: './third_party'
@@ -130,7 +130,7 @@ jobs:
130130
CXX: ${{ matrix.cxx-compiler }}
131131
steps:
132132
- uses: actions/checkout@master
133-
- uses: seanmiddleditch/gha-setup-ninja@v4
133+
- uses: seanmiddleditch/gha-setup-ninja@v6
134134
if: contains(matrix.generator, 'Ninja')
135135

136136
- name: install boost
@@ -175,7 +175,7 @@ jobs:
175175
DEVELOPER_DIR: '/Applications/Xcode_${{ matrix.xcode-version }}.app/Contents/Developer'
176176
steps:
177177
- uses: actions/checkout@master
178-
- uses: seanmiddleditch/gha-setup-ninja@v4
178+
- uses: seanmiddleditch/gha-setup-ninja@v6
179179
if: contains(matrix.generator, 'Ninja')
180180

181181
- name: install boost

ApprovalTests/integrations/catch/Catch2Approvals.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@ struct Catch2ApprovalListener : Catch::TestEventListenerBase
4848

4949
virtual void sectionEnded(Catch::SectionStats const& /*sectionStats*/) override
5050
{
51-
currentTest.sections.pop_back();
51+
if (!currentTest.sections.empty())
52+
{
53+
currentTest.sections.pop_back();
54+
}
5255
}
5356
};
5457
//}

0 commit comments

Comments
 (0)