Use clang-format from CI base image (#6391)

Project-OSRM · Oct 6, 2022 · 52b516e · 52b516e
1 parent f3c0330
commit 52b516e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml
@@ -88,9 +88,7 @@ jobs:
     - name: Prepare environment
       run: |
         npm ci --ignore-scripts
-        export MASON=${GITHUB_WORKSPACE}/scripts/mason.sh
-        ${MASON} install clang-format 10.0.0
-        echo "$(${MASON} prefix clang-format 10.0.0)/bin" >> $GITHUB_PATH
+        clang-format-10 --version
     - name: Run checks
       run: |
         ./scripts/check_taginfo.py taginfo.json profiles/car.lua

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,7 @@
       - 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)
     - 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: 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)

diff --git a/scripts/format.sh b/scripts/format.sh
@@ -19,8 +19,8 @@ elif [[ ${OS} = "Darwin" ]] ; then
 fi
 
 # Discover clang-format
-if type clang-format-10.0.0 2> /dev/null ; then
-    CLANG_FORMAT=clang-format-10.0.0
+if type clang-format-10 2> /dev/null ; then
+    CLANG_FORMAT=clang-format-10
 elif type clang-format 2> /dev/null ; then
     # Clang format found, but need to check version
     CLANG_FORMAT=clang-format
@@ -30,7 +30,7 @@ elif type clang-format 2> /dev/null ; then
         #exit 1
     fi
 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
 fi