Skip to content

Commit 6b53934

Browse files
committed
Update actions and clang-format
1 parent 7809838 commit 6b53934

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,15 @@ on:
1111
jobs:
1212
check_clang_format:
1313
name: "Check C++ style"
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-22.04
1515
steps:
1616
- uses: actions/checkout@v3
1717
- name: Run clang-format style check for C/C++/Protobuf programs.
1818
uses: jidicula/[email protected]
1919
with:
20-
clang-format-version: '15'
20+
clang-format-version: '16'
2121
check-path: '.'
2222
#exclude-regex: 'sse2neon.h'
23-
- name: "Check includes"
24-
run: ./scripts/check-includes.sh
2523

2624
editorconfig:
2725
name: "Check editorconfig"
@@ -57,10 +55,10 @@ jobs:
5755
run: sudo apt -q update
5856

5957
- name: Install Compilers
60-
run: sudo apt install -y g++-11 clang-14
58+
run: sudo apt install -y g++-11 clang-14
6159

6260
- name: "Download dependencies"
63-
run: sudo apt install cmake ninja-build
61+
run: sudo apt install cmake ninja-build catch2
6462
- name: "Cmake configure"
6563
run: cmake -S . -B build -G Ninja -D BOXED_CPP_TESTS=ON -D ENABLE_TIDY=ON -DPEDANTIC_COMPILER=ON -D CMAKE_CXX_FLAGS="-Wno-unknown-warning-option" -DCMAKE_CXX_COMPILER=${{ matrix.compiler }} -DCMAKE_CXX_STANDARD=${{ matrix.cxx }} -DCMAKE_BUILD_TYPE=${{matrix.build_type}}
6664
- name: "build "

include/boxed-cpp/boxed.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,9 @@ struct hash<boxed::boxed<T, U>>
199199
};
200200
} // namespace std
201201
// {{{ fmtlib integration
202+
// clang-format off
202203
#if __has_include(<fmt/format.h>)
203204

204-
// clang-format off
205205
#include <fmt/format.h>
206206
// clang-format on
207207

0 commit comments

Comments
 (0)