Skip to content

Commit 52b516e

Browse files
Use clang-format from CI base image (#6391)
1 parent f3c0330 commit 52b516e

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/workflows/osrm-backend.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,7 @@ jobs:
8888
- name: Prepare environment
8989
run: |
9090
npm ci --ignore-scripts
91-
export MASON=${GITHUB_WORKSPACE}/scripts/mason.sh
92-
${MASON} install clang-format 10.0.0
93-
echo "$(${MASON} prefix clang-format 10.0.0)/bin" >> $GITHUB_PATH
91+
clang-format-10 --version
9492
- name: Run checks
9593
run: |
9694
./scripts/check_taginfo.py taginfo.json profiles/car.lua

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ Thumbs.db
6767
/.vs*
6868
/*.local.bat
6969
/CMakeSettings.json
70+
/.cache
7071

7172
# Jetbrains related files #
7273
###########################

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
- FIXED: Internal refactoring of identifier types used in data facade [#6044](https://github.com/Project-OSRM/osrm-backend/pull/6044)
2828
- CHANGED: Update docs to reflect recent build and dependency changes [#6383](https://github.com/Project-OSRM/osrm-backend/issues/6383)
2929
- Build:
30+
- CHANGED: Use clang-format from CI base image. [#6391](https://github.com/Project-OSRM/osrm-backend/pull/6391)
3031
- ADDED: Build Node bindings on Windows. [#6334](https://github.com/Project-OSRM/osrm-backend/pull/6334)
3132
- ADDED: Configure cross-compilation for Apple Silicon. [#6360](https://github.com/Project-OSRM/osrm-backend/pull/6360)
3233
- CHANGED: Use apt-get to install Clang on CI. [#6345](https://github.com/Project-OSRM/osrm-backend/pull/6345)

scripts/format.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ elif [[ ${OS} = "Darwin" ]] ; then
1919
fi
2020

2121
# Discover clang-format
22-
if type clang-format-10.0.0 2> /dev/null ; then
23-
CLANG_FORMAT=clang-format-10.0.0
22+
if type clang-format-10 2> /dev/null ; then
23+
CLANG_FORMAT=clang-format-10
2424
elif type clang-format 2> /dev/null ; then
2525
# Clang format found, but need to check version
2626
CLANG_FORMAT=clang-format
@@ -30,7 +30,7 @@ elif type clang-format 2> /dev/null ; then
3030
#exit 1
3131
fi
3232
else
33-
echo "No appropriate clang-format found (expected clang-format-10.0.0, or clang-format)"
33+
echo "No appropriate clang-format found (expected clang-format-10, or clang-format)"
3434
exit 1
3535
fi
3636

0 commit comments

Comments
 (0)