SYS-OSS/FRET-LibAFL
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Use clang-format-16 (#1649)" (#1650)

Browse Source 
This reverts commit 1aede04af75564d4063f91d1c8c1a402760e86f5.
This commit is contained in:
Dominik Maier 2023-11-04 21:38:36 +01:00 committed by GitHub
parent 65ddfa6acf
commit 8545778780
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build_and_test.yml vendored
View File

@ -68,7 +68,7 @@ jobs:
- name: Install and cache deps - name: Install and cache deps
uses: awalsh128/cache-apt-pkgs-action@v1.1.0 uses: awalsh128/cache-apt-pkgs-action@v1.1.0
with: with:
packages: llvm-15 llvm-15-dev clang-15 ninja-build clang-format-16 shellcheck libgtk-3-dev gcc-arm-linux-gnueabi g++-arm-linux-gnueabi libslirp-dev libz3-dev packages: llvm-15 llvm-15-dev clang-15 ninja-build clang-format-13 shellcheck libgtk-3-dev gcc-arm-linux-gnueabi g++-arm-linux-gnueabi libslirp-dev libz3-dev
- name: get clang version - name: get clang version
run: command -v llvm-config-15 && clang-15 -v run: command -v llvm-config-15 && clang-15 -v
- name: Add nightly rustfmt and clippy - name: Add nightly rustfmt and clippy
@ -85,7 +85,7 @@ jobs:
- name: Cleanup - name: Cleanup
run: cargo clean run: cargo clean
- name: Run clang-format style check for C/C++ programs. - name: Run clang-format style check for C/C++ programs.
run: clang-format-16 -n -Werror --style=file $(find . -type f \( -name '*.cpp' -o -iname '*.hpp' -o -name '*.cc' -o -name '*.cxx' -o -name '*.cc' -o -name '*.h' \) | grep -v '/target/' | grep -v 'libpng-1\.6\.37' | grep -v 'stb_image\.h' | grep -v 'dlmalloc\.c' | grep -v 'QEMU-Nyx') run: clang-format-13 -n -Werror --style=file $(find . -type f \( -name '*.cpp' -o -iname '*.hpp' -o -name '*.cc' -o -name '*.cxx' -o -name '*.cc' -o -name '*.h' \) | grep -v '/target/' | grep -v 'libpng-1\.6\.37' | grep -v 'stb_image\.h' | grep -v 'dlmalloc\.c' | grep -v 'QEMU-Nyx')
- name: run shellcheck - name: run shellcheck
run: shellcheck ./scripts/*.sh run: shellcheck ./scripts/*.sh
- name: Run clippy - name: Run clippy
@ -129,7 +129,7 @@ jobs:
- name: Install and cache deps - name: Install and cache deps
uses: awalsh128/cache-apt-pkgs-action@v1.1.0 uses: awalsh128/cache-apt-pkgs-action@v1.1.0
with: with:
packages: llvm-15 llvm-15-dev clang-15 ninja-build clang-format-16 shellcheck libgtk-3-dev gcc-arm-linux-gnueabi g++-arm-linux-gnueabi libslirp-dev libz3-dev packages: llvm-15 llvm-15-dev clang-15 ninja-build clang-format-13 shellcheck libgtk-3-dev gcc-arm-linux-gnueabi g++-arm-linux-gnueabi libslirp-dev libz3-dev
- name: get clang version - name: get clang version
run: command -v llvm-config-15 && clang-15 -v run: command -v llvm-config-15 && clang-15 -v
- name: Install cargo-hack - name: Install cargo-hack

2
scripts/fmt_all.sh
View File

@ -11,7 +11,7 @@ cargo +nightly fmt
echo "[*] Formatting C(pp) files" echo "[*] Formatting C(pp) files"
# shellcheck disable=SC2046 # shellcheck disable=SC2046
clang-format-16 -i --style=file $(find . -type f \( -name '*.cpp' -o -iname '*.hpp' -o -name '*.cc' -o -name '*.cxx' -o -name '*.cc' -o -name '*.c' -o -name '*.h' \) | grep -v '/target/' | grep -v 'libpng-1\.6\.37' | grep -v 'stb_image\.h' | grep -v 'dlmalloc\.c') clang-format-13 -i --style=file $(find . -type f \( -name '*.cpp' -o -iname '*.hpp' -o -name '*.cc' -o -name '*.cxx' -o -name '*.cc' -o -name '*.c' -o -name '*.h' \) | grep -v '/target/' | grep -v 'libpng-1\.6\.37' | grep -v 'stb_image\.h' | grep -v 'dlmalloc\.c')