diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml index ed8e855c6..7b208cd86 100644 --- a/.github/workflows/osrm-backend.yml +++ b/.github/workflows/osrm-backend.yml @@ -88,9 +88,9 @@ 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 + which clang-format + ls /usr/bin + clang-format-14 --version - name: Run checks run: | ./scripts/check_taginfo.py taginfo.json profiles/car.lua diff --git a/.gitignore b/.gitignore index 21bf08310..a821eef52 100644 --- a/.gitignore +++ b/.gitignore @@ -67,6 +67,7 @@ Thumbs.db /.vs* /*.local.bat /CMakeSettings.json +/.cache # Jetbrains related files # ########################### diff --git a/scripts/format.sh b/scripts/format.sh index cd462756d..1a256d27e 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-10.0.0 2> /dev/null ; then - CLANG_FORMAT=clang-format-10.0.0 +if type clang-format-14 2> /dev/null ; then + CLANG_FORMAT=clang-format-14 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 != *10.0* ]] ; then - echo "clang-format is not 10.0 (returned ${V})" + if [[ $V != *14.0* ]] ; then + echo "clang-format is not 14.0 (returned ${V})" #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-14, or clang-format)" exit 1 fi