diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml index d1a14d8a9..f338e05fb 100644 --- a/.github/workflows/osrm-backend.yml +++ b/.github/workflows/osrm-backend.yml @@ -88,7 +88,7 @@ jobs: - name: Prepare environment run: | npm ci --ignore-scripts - clang-format-14 --version + clang-format-15 --version - name: Run checks run: | ./scripts/check_taginfo.py taginfo.json profiles/car.lua diff --git a/CHANGELOG.md b/CHANGELOG.md index 5acca7957..c60375185 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ - REMOVED: Drop support of Node 12 & 14. [#6431](https://github.com/Project-OSRM/osrm-backend/pull/6431) - ADDED: Add 'load directly' mode to default Cucumber test suite. [#6663](https://github.com/Project-OSRM/osrm-backend/pull/6663) - CHANGED: Drop support for Node 16 [#6855](https://github.com/Project-OSRM/osrm-backend/pull/6855) - - CHANGED: Upgrade clang-format to version 14 [#6859](https://github.com/Project-OSRM/osrm-backend/pull/6859) + - CHANGED: Upgrade clang-format to version 15 [#6859](https://github.com/Project-OSRM/osrm-backend/pull/6859) - NodeJS: - CHANGED: Use node-api instead of NAN. [#6452](https://github.com/Project-OSRM/osrm-backend/pull/6452) - Misc: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2b36d2b6c..2b01a4a77 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,7 +10,7 @@ You can add a :+1: emoji reaction to the issue if you want to express interest i # Developer -We use `clang-format` version `14` to consistently format the code base. There is a helper script under `scripts/format.sh`. +We use `clang-format` version `15` to consistently format the code base. There is a helper script under `scripts/format.sh`. The format is automatically checked by the `mason-linux-release` job of a Travis CI build. To save development time a local hook `.git/hooks/pre-push` ``` diff --git a/scripts/format.sh b/scripts/format.sh index 1a256d27e..93e6a50f9 100755 --- a/scripts/format.sh +++ b/scripts/format.sh @@ -19,18 +19,18 @@ elif [[ ${OS} = "Darwin" ]] ; then fi # Discover clang-format -if type clang-format-14 2> /dev/null ; then - CLANG_FORMAT=clang-format-14 +if type clang-format-15 2> /dev/null ; then + CLANG_FORMAT=clang-format-15 elif type clang-format 2> /dev/null ; then # Clang format found, but need to check version CLANG_FORMAT=clang-format V=$(clang-format --version) - if [[ $V != *14.0* ]] ; then - echo "clang-format is not 14.0 (returned ${V})" + if [[ $V != *15.0* ]] ; then + echo "clang-format is not 15.0 (returned ${V})" #exit 1 fi else - echo "No appropriate clang-format found (expected clang-format-14, or clang-format)" + echo "No appropriate clang-format found (expected clang-format-15, or clang-format)" exit 1 fi