Skip to content

Commit 6a908d6

Browse files
committed
cleanup
1 parent 7d842ad commit 6a908d6

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

ci/install_abseil.sh

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ fi
5555
if [ "${ABSEIL_CPP_VERSION}" = "20240116.1" ] || [ "${ABSEIL_CPP_VERSION}" = "20240116.2" ]; then
5656
echo "Patching abseil"
5757
patch -p1 < ${TOPDIR}/ci/fix-abseil-cpp-issue-1536.patch
58-
EOF
5958
else
6059
echo "Not patching abseil"
6160
fi

tools/format.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ fi
2323
# No CRLF line endings, except Windows files.
2424
"${SED[@]}" 's/\r$//' $($FIND -name '*.ps1' -prune -o \
2525
-name '*.cmd' -prune -o -type f -print)
26-
# No trailing spaces.
27-
"${SED[@]}" 's/ \+$//' $($FIND -type f -print)
26+
# No trailing spaces, except in patch.
27+
"${SED[@]}" 's/ \+$//' $($FIND -name "*.patch" -prune -o -type f -print)
2828

2929
# If not overridden, try to use clang-format-18 or clang-format.
3030
if [[ -z "$CLANG_FORMAT" ]]; then

0 commit comments

Comments
 (0)