ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2025-11-05 20:35:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix CI

Browse Source
This commit is contained in:
Sergey Kuznetsov
2023-11-29 15:17:34 +00:00
committed by Sergey Kuznetsov
parent 9ef6801c55
commit 252920ec57
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.githooks/pre-commit
View File

@@ -12,7 +12,7 @@ if [[ "17.0.0" > "$version" ]]; then
ERROR ERROR
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
A minimum of version 17 of `clang-format` is required. A minimum of version 17 of `which clang-format` is required.
Your version is $version. Your version is $version.
Please fix paths and run again. Please fix paths and run again.
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
@@ -30,14 +30,14 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
grep_code '#include ".*"' | xargs sed -i '' -E 's|#include "(.*)"|#include <\1>|g' grep_code '#include ".*"' | xargs sed -i '' -E 's|#include "(.*)"|#include <\1>|g'
# make local includes to be "..." style # make local includes to be "..." style
main_src_dirs=$(find ./src -type d -d 1 -exec basename {} \; | paste -sd '|' | sed 's/|/\\|/g') main_src_dirs=$(find ./src -type d -maxdepth 1 -exec basename {} \; | paste -sd '|' | sed 's/|/\\|/g')
grep_code "#include <\($main_src_dirs\)/.*>" | xargs sed -i '' -E "s|#include <(($main_src_dirs)/.*)>|#include \"\1\"|g" grep_code "#include <\($main_src_dirs\)/.*>" | xargs sed -i '' -E "s|#include <(($main_src_dirs)/.*)>|#include \"\1\"|g"
else else
# make all includes to be <...> style # make all includes to be <...> style
grep_code '#include ".*"' | xargs sed -i -E 's|#include "(.*)"|#include <\1>|g' grep_code '#include ".*"' | xargs sed -i -E 's|#include "(.*)"|#include <\1>|g'
# make local includes to be "..." style # make local includes to be "..." style
main_src_dirs=$(find ./src -type d -d 1 -exec basename {} \; | paste -sd '|' | sed 's/|/\\|/g') main_src_dirs=$(find ./src -type d -maxdepth 1 -exec basename {} \; | paste -sd '|' | sed 's/|/\\|/g')
grep_code "#include <\($main_src_dirs\)/.*>" | xargs sed -i -E "s|#include <(($main_src_dirs)/.*)>|#include \"\1\"|g" grep_code "#include <\($main_src_dirs\)/.*>" | xargs sed -i -E "s|#include <(($main_src_dirs)/.*)>|#include \"\1\"|g"
fi fi

2
.github/actions/clang_format/action.yml vendored
View File

@@ -13,6 +13,8 @@ runs:
run: | run: |
sudo apt update -qq sudo apt update -qq
sudo apt install -y jq clang-format-17 sudo apt install -y jq clang-format-17
sudo rm /usr/bin/clang-format
sudo ln -s /usr/bin/clang-format-17 /usr/bin/clang-format
shell: bash shell: bash
- name: Run formatter - name: Run formatter