Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Use clang-format from CI base image

Browse Source
This commit is contained in:
Siarhei Fedartsou 2022-10-04 18:03:04 +02:00
parent 43efd0767f
commit 8d1da94e28
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/osrm-backend.yml vendored
View File

@ -88,7 +88,7 @@ jobs:
- name: Prepare environment - name: Prepare environment
run: | run: |
npm ci --ignore-scripts npm ci --ignore-scripts
clang-format-11 --version clang-format-10 --version
- name: Run checks - name: Run checks
run: | run: |
./scripts/check_taginfo.py taginfo.json profiles/car.lua ./scripts/check_taginfo.py taginfo.json profiles/car.lua

10
scripts/format.sh
View File

@ -19,18 +19,18 @@ elif [[ ${OS} = "Darwin" ]] ; then
fi fi
# Discover clang-format # Discover clang-format
if type clang-format-11 2> /dev/null ; then if type clang-format-10 2> /dev/null ; then
CLANG_FORMAT=clang-format-11 CLANG_FORMAT=clang-format-10
elif type clang-format 2> /dev/null ; then elif type clang-format 2> /dev/null ; then
# Clang format found, but need to check version # Clang format found, but need to check version
CLANG_FORMAT=clang-format CLANG_FORMAT=clang-format
V=$(clang-format --version) V=$(clang-format --version)
if [[ $V != *11.0* ]] ; then if [[ $V != *10.0* ]] ; then
echo "clang-format is not 11.0 (returned ${V})" echo "clang-format is not 10.0 (returned ${V})"
#exit 1 #exit 1
fi fi
else else
echo "No appropriate clang-format found (expected clang-format-11, or clang-format)" echo "No appropriate clang-format found (expected clang-format-10, or clang-format)"
exit 1 exit 1
fi fi