Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 15:21:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

clang-format: Enable --Wno-error=unknown for compat with older versions

Browse Source 
This prevents errors when encountering options which have been defined in newer
versions of clang-format, and are invalid in the YAML for the old version.

Bump minimum supported clang-format version to 12 (where `--Wno-error=unknown`
was added).

Use clang-format 12 on CI (13 is not available yet on the Ubuntu 20.04 images).
This commit is contained in:
Rémi Verschelde
2021-10-24 23:48:21 +02:00
parent f5b85cd066
commit 55d05565d0
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/static_checks.yml vendored
View File

@@ -22,9 +22,9 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: | run: |
sudo apt-get install -qq dos2unix recode clang-format-11 sudo apt-get install -qq dos2unix recode clang-format-12
sudo update-alternatives --remove-all clang-format sudo update-alternatives --remove-all clang-format
sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-11 100 sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-12 100
sudo pip3 install black==20.8b1 pygments sudo pip3 install black==20.8b1 pygments
- name: File formatting checks (file_format.sh) - name: File formatting checks (file_format.sh)

4
misc/hooks/pre-commit-clang-format
View File

@@ -76,7 +76,7 @@ fi
# To get consistent formatting, we recommend contributors to use the same # To get consistent formatting, we recommend contributors to use the same
# clang-format version as CI. # clang-format version as CI.
RECOMMENDED_CLANG_FORMAT_MAJOR_MIN="11" RECOMMENDED_CLANG_FORMAT_MAJOR_MIN="12"
RECOMMENDED_CLANG_FORMAT_MAJOR_MAX="13" RECOMMENDED_CLANG_FORMAT_MAJOR_MAX="13"
if [ ! -x "$CLANG_FORMAT" ] ; then if [ ! -x "$CLANG_FORMAT" ] ; then
@@ -146,7 +146,7 @@ do
# +++ - timestamp # +++ - timestamp
# to both lines working on the same file and having a/ and b/ prefix. # to both lines working on the same file and having a/ and b/ prefix.
# Else it can not be applied with 'git apply'. # Else it can not be applied with 'git apply'.
"$CLANG_FORMAT" -style=file "$file" | \ "$CLANG_FORMAT" -style=file "$file" --Wno-error=unknown | \
diff -u "$file" - | \ diff -u "$file" - | \
sed -e "1s|--- |--- a/|" -e "2s|+++ -|+++ b/$file|" >> "$patch" sed -e "1s|--- |--- a/|" -e "2s|+++ -|+++ b/$file|" >> "$patch"
done done

2
misc/scripts/clang_format.sh
View File

@@ -23,7 +23,7 @@ while IFS= read -rd '' f; do
for extension in ${CLANG_FORMAT_FILE_EXTS[@]}; do for extension in ${CLANG_FORMAT_FILE_EXTS[@]}; do
if [[ "$f" == *"$extension" ]]; then if [[ "$f" == *"$extension" ]]; then
# Run clang-format. # Run clang-format.
clang-format -i "$f" clang-format --Wno-error=unknown -i "$f"
# Fix copyright headers, but not all files get them. # Fix copyright headers, but not all files get them.
if [[ "$f" == *"inc" ]]; then if [[ "$f" == *"inc" ]]; then
continue 2 continue 2