Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,13 @@ CommentPragmas: '^ IWYU pragma:'
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
SpaceBeforeParens: ControlStatements
DisableFormat: false
FixNamespaceComments: false
ReflowComments: false
SortIncludes: Never
BinPackArguments: false
SortUsingDeclarations: false
SpacesInLineCommentPrefix:
Minimum: 0
Maximum: -1
...

68 changes: 68 additions & 0 deletions .github/workflows/cpp-format.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

# THRIFT-6219: most of lib/cpp predates .clang-format, so formatting whole
# files would rewrite code the pull request never touched. Only the lines the
# pull request changes are checked. The version is pinned because clang-format
# releases differ in their output.

name: "C++ formatting"

on:
pull_request:
paths:
- ".clang-format"
- "lib/cpp/**"
- ".github/workflows/cpp-format.yml"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

permissions:
contents: read

jobs:
clang-format:
name: clang-format on changed lines
runs-on: ubuntu-24.04
timeout-minutes: 10
steps:
# The pull_request checkout is the merge commit, so its first parent is
# the base branch and HEAD^ is exactly what the pull request changes.
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
fetch-depth: 2
persist-credentials: false

- name: Install clang-format 18
run: |
if ! command -v git-clang-format-18 >/dev/null; then
sudo apt-get update -qq
sudo apt-get install -y -qq clang-format-18
fi
clang-format-18 --version

- name: Check changed lines in lib/cpp
run: |
# .tcc is not in git-clang-format's default extension list.
if ! git-clang-format-18 --binary clang-format-18 \
--extensions c,cc,cpp,cxx,h,hh,hpp,tcc \
--diff HEAD^ -- lib/cpp; then
echo "::error::Changed lines in lib/cpp do not match .clang-format. Run 'git clang-format --binary clang-format-18 --extensions c,cc,cpp,cxx,h,hh,hpp,tcc origin/master -- lib/cpp' and amend the commit."
exit 1
fi
2 changes: 2 additions & 0 deletions lib/cpp/src/thrift/protocol/TBase64Utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ void base64_encode(const uint8_t* in, uint32_t len, uint8_t* buf) {
}
}

// clang-format off
static const uint8_t kBase64DecodeTable[256] = {
0xff,
0xff,
Expand Down Expand Up @@ -300,6 +301,7 @@ static const uint8_t kBase64DecodeTable[256] = {
0xff,
0xff,
};
// clang-format on

void base64_decode(uint8_t* buf, uint32_t len) {
buf[0] = (kBase64DecodeTable[buf[0]] << 2) | (kBase64DecodeTable[buf[1]] >> 4);
Expand Down
Loading