Skip to content

Commit fe0fa26

Browse files
committed
Update clang-format from 12 to 13
1 parent 6c44455 commit fe0fa26

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

.github/workflows/clang-format.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push, pull_request]
44

55
jobs:
66
ubuntu64:
7-
runs-on: ubuntu-latest
7+
runs-on: ubuntu-22.04
88
steps:
99
- name: Checkout
1010
uses: actions/checkout@v2
@@ -13,9 +13,9 @@ jobs:
1313

1414
- name: Install clang format
1515
run: |
16-
sudo apt-get install -y clang-format-12
16+
sudo apt-get install -y clang-format-13
1717
1818
- name: Check the Formatting
1919
run: |
2020
./formatcode.sh
21-
./CI/check-format.sh
21+
./CI/check-format.sh

browser-client.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,10 @@ CefRefPtr<CefResourceRequestHandler> BrowserClient::GetResourceRequestHandler(
8484
return nullptr;
8585
}
8686

87-
CefResourceRequestHandler::ReturnValue BrowserClient::OnBeforeResourceLoad(
88-
CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>, CefRefPtr<CefRequest>,
89-
CefRefPtr<CefCallback>)
87+
CefResourceRequestHandler::ReturnValue
88+
BrowserClient::OnBeforeResourceLoad(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>,
89+
CefRefPtr<CefRequest>,
90+
CefRefPtr<CefCallback>)
9091
{
9192
return RV_CONTINUE;
9293
}

formatcode.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ if [[ $OS = "Linux" || $OS = "Darwin" ]] ; then
1919
fi
2020

2121
# Discover clang-format
22-
if type clang-format-12 2> /dev/null ; then
23-
CLANG_FORMAT=clang-format-12
22+
if type clang-format-13 2> /dev/null ; then
23+
CLANG_FORMAT=clang-format-13
2424
elif type clang-format-10 2> /dev/null ; then
2525
CLANG_FORMAT=clang-format-10
2626
elif type clang-format-8 2> /dev/null ; then
@@ -30,4 +30,4 @@ else
3030
fi
3131

3232
find . -type d -type f -o -name '*.h' -or -name '*.hpp' -or -name '*.m' -or -name '*.mm' -or -name '*.c' -or -name '*.cpp' \
33-
| xargs -I{} -P ${NPROC} ${CLANG_FORMAT} -i -style=file -fallback-style=none {}
33+
| xargs -I{} -P ${NPROC} ${CLANG_FORMAT} -i -style=file -fallback-style=none {}

0 commit comments

Comments
 (0)