Merge branch 'master' into sf-clang-15

.github/workflows/osrm-backend.yml

@@ -95,6 +95,7 @@ jobs:
         ./scripts/format.sh && ./scripts/error_on_dirty.sh
         node ./scripts/validate_changelog.js
         npm run docs && ./scripts/error_on_dirty.sh
+        npm audit --production
 
   docker-image:
     needs: format-taginfo-docs
@@ -506,9 +507,12 @@ jobs:
     - name: Install dev dependencies
       run: |
         python3 -m pip install conan==1.53.0
-        echo "/Library/Frameworks/Python.framework/Versions/3.11/bin" >> $GITHUB_PATH
+
-        ls "/Library/Frameworks/Python.framework/Versions/3.11/bin"
+        # workaround for issue that GitHub Actions seems to not adding it to PATH after https://github.com/actions/runner-images/pull/6499
-        # conan --version
+        # and that's why CI cannot find conan executable installed above
+        if [[ "${RUNNER_OS}" == "macOS" ]]; then
+          echo "/Library/Frameworks/Python.framework/Versions/Current/bin" >> $GITHUB_PATH
+        fi
 
         # ccache
         if [[ "${RUNNER_OS}" == "Linux" ]]; then

CHANGELOG.md

@@ -5,6 +5,8 @@
       - CHANGED: Update actions/cache to v3. [#6420](https://github.com/Project-OSRM/osrm-backend/pull/6420)
       - REMOVED: Drop support of Node 12 & 14. [#6431](https://github.com/Project-OSRM/osrm-backend/pull/6431)
     - Misc:
+      - FIXED: Apply workaround for Conan installation issue on CI. [#6442](https://github.com/Project-OSRM/osrm-backend/pull/6442)
+      - FIXED: Fix `npm audit` warnings in NPM package. [#6437](https://github.com/Project-OSRM/osrm-backend/pull/6437)
       - FIXED: Handle snapping parameter for all plugins in NodeJs bindings, but not for Route only. [#6417](https://github.com/Project-OSRM/osrm-backend/pull/6417)
       - FIXED: Fix annotations=true handling in NodeJS bindings & libosrm. [#6415](https://github.com/Project-OSRM/osrm-backend/pull/6415/)
       - FIXED: Fix bindings compilation issue on the latest Node. Update NAN to 2.17.0. [#6416](https://github.com/Project-OSRM/osrm-backend/pull/6416)

package.json

@@ -4,12 +4,7 @@
   "private": false,
   "description": "The Open Source Routing Machine is a high performance routing engine written in C++14 designed to run on OpenStreetMap data.",
   "dependencies": {
-    "@mapbox/node-pre-gyp": "^1.0.9",
+    "@mapbox/node-pre-gyp": "^1.0.10"
-    "cheap-ruler": "^3.0.2",
-    "mkdirp": "^0.5.6",
-    "nan": "^2.17.0",
-    "node-cmake": "^2.5.1",
-    "rimraf": "^2.7.1"
   },
   "browserify": {
     "transform": [
@@ -66,14 +61,13 @@
     "tape": "^4.16.0",
     "turf": "^3.0.14",
     "uglify-js": "^3.17.0",
-    "xmlbuilder": "^4.2.1"
+    "xmlbuilder": "^4.2.1",
+    "cheap-ruler": "^3.0.2",
+    "mkdirp": "^0.5.6",
+    "nan": "^2.17.0",
+    "node-cmake": "^2.5.1",
+    "rimraf": "^2.7.1"
   },
-  "bundleDependencies": [
-    "mkdirp",
-    "nan",
-    "node-cmake",
-    "rimraf"
-  ],
   "main": "lib/index.js",
   "binary": {
     "module_name": "node_osrm",

scripts/check_taginfo.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 import json
 import sys
@@ -7,7 +7,7 @@ import re
 WHITELIST = set(["mph"])
 
 if len(sys.argv) < 3:
-    print "Not enough arguments.\nUsage: " + sys.argv[0] + " taginfo.json profile.lua"
+    print("Not enough arguments.\nUsage: " + sys.argv[0] + " taginfo.json profile.lua")
     sys.exit(1)
 
 taginfo_path = sys.argv[1]