Skip to content

Commit f7aa2dc

Browse files
committed
Update clang-format from 10 to 12
This matches changes applied to the obs-studio repo.
1 parent aee4300 commit f7aa2dc

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.github/workflows/clang-format.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Clang Format Check
22

33
on: [push, pull_request]
4+
45
jobs:
56
ubuntu64:
67
runs-on: ubuntu-latest
@@ -12,7 +13,7 @@ jobs:
1213

1314
- name: Install clang format
1415
run: |
15-
sudo apt-get install -y clang-format-10
16+
sudo apt-get install -y clang-format-12
1617
1718
- name: Check the Formatting
1819
run: |

formatcode.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ if [[ $OS = "Linux" || $OS = "Darwin" ]] ; then
1919
fi
2020

2121
# Discover clang-format
22-
if type clang-format-8 2> /dev/null ; then
22+
if type clang-format-12 2> /dev/null ; then
23+
CLANG_FORMAT=clang-format-12
24+
elif type clang-format-10 2> /dev/null ; then
25+
CLANG_FORMAT=clang-format-10
26+
elif type clang-format-8 2> /dev/null ; then
2327
CLANG_FORMAT=clang-format-8
2428
else
2529
CLANG_FORMAT=clang-format

0 commit comments

Comments
 (0)