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 (#6391)

Browse Source
This commit is contained in:
Siarhei Fedartsou 2022-10-06 12:50:31 +02:00 committed by GitHub
parent f3c03307cb
commit 52b516e943
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,9 +88,7 @@ jobs:
- name: Prepare environment - name: Prepare environment
run: | run: |
npm ci --ignore-scripts npm ci --ignore-scripts
export MASON=${GITHUB_WORKSPACE}/scripts/mason.sh clang-format-10 --version
${MASON} install clang-format 10.0.0
echo "$(${MASON} prefix clang-format 10.0.0)/bin" >> $GITHUB_PATH
- 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

1
.gitignore vendored
View File

@ -67,6 +67,7 @@ Thumbs.db
/.vs* /.vs*
/*.local.bat /*.local.bat
/CMakeSettings.json /CMakeSettings.json
/.cache
# Jetbrains related files # # Jetbrains related files #
########################### ###########################

1
CHANGELOG.md
View File

@ -27,6 +27,7 @@
- FIXED: Internal refactoring of identifier types used in data facade [#6044](https://github.com/Project-OSRM/osrm-backend/pull/6044) - FIXED: Internal refactoring of identifier types used in data facade [#6044](https://github.com/Project-OSRM/osrm-backend/pull/6044)
- CHANGED: Update docs to reflect recent build and dependency changes [#6383](https://github.com/Project-OSRM/osrm-backend/issues/6383) - CHANGED: Update docs to reflect recent build and dependency changes [#6383](https://github.com/Project-OSRM/osrm-backend/issues/6383)
- Build: - Build:
- CHANGED: Use clang-format from CI base image. [#6391](https://github.com/Project-OSRM/osrm-backend/pull/6391)
- ADDED: Build Node bindings on Windows. [#6334](https://github.com/Project-OSRM/osrm-backend/pull/6334) - ADDED: Build Node bindings on Windows. [#6334](https://github.com/Project-OSRM/osrm-backend/pull/6334)
- ADDED: Configure cross-compilation for Apple Silicon. [#6360](https://github.com/Project-OSRM/osrm-backend/pull/6360) - ADDED: Configure cross-compilation for Apple Silicon. [#6360](https://github.com/Project-OSRM/osrm-backend/pull/6360)
- CHANGED: Use apt-get to install Clang on CI. [#6345](https://github.com/Project-OSRM/osrm-backend/pull/6345) - CHANGED: Use apt-get to install Clang on CI. [#6345](https://github.com/Project-OSRM/osrm-backend/pull/6345)

6
scripts/format.sh
View File

@ -19,8 +19,8 @@ elif [[ ${OS} = "Darwin" ]] ; then
fi fi
# Discover clang-format # Discover clang-format
if type clang-format-10.0.0 2> /dev/null ; then if type clang-format-10 2> /dev/null ; then
CLANG_FORMAT=clang-format-10.0.0 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
@ -30,7 +30,7 @@ elif type clang-format 2> /dev/null ; then
#exit 1 #exit 1
fi fi
else else
echo "No appropriate clang-format found (expected clang-format-10.0.0, or clang-format)" echo "No appropriate clang-format found (expected clang-format-10, or clang-format)"
exit 1 exit 1
fi fi