Merge pull request #6857 from DennisOSRM/upgrade_js_dependencies
Drop support for NodeJS <= v16
This commit is contained in:
commit
befd9dc5ae
75
.github/workflows/osrm-backend.yml
vendored
75
.github/workflows/osrm-backend.yml
vendored
@ -34,7 +34,7 @@ jobs:
|
|||||||
- run: cmake --version
|
- run: cmake --version
|
||||||
- uses: actions/setup-node@v3
|
- uses: actions/setup-node@v3
|
||||||
with:
|
with:
|
||||||
node-version: 16
|
node-version: 18
|
||||||
- run: node --version
|
- run: node --version
|
||||||
- run: npm --version
|
- run: npm --version
|
||||||
- name: Prepare environment
|
- name: Prepare environment
|
||||||
@ -77,7 +77,7 @@ jobs:
|
|||||||
- name: Use Node.js
|
- name: Use Node.js
|
||||||
uses: actions/setup-node@v3
|
uses: actions/setup-node@v3
|
||||||
with:
|
with:
|
||||||
node-version: 16
|
node-version: 18
|
||||||
- name: Enable Node.js cache
|
- name: Enable Node.js cache
|
||||||
uses: actions/cache@v3
|
uses: actions/cache@v3
|
||||||
with:
|
with:
|
||||||
@ -147,7 +147,7 @@ jobs:
|
|||||||
include:
|
include:
|
||||||
- name: gcc-9-debug-cov
|
- name: gcc-9-debug-cov
|
||||||
continue-on-error: false
|
continue-on-error: false
|
||||||
node: 16
|
node: 18
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
BUILD_TOOLS: ON
|
BUILD_TOOLS: ON
|
||||||
BUILD_TYPE: Debug
|
BUILD_TYPE: Debug
|
||||||
@ -158,7 +158,7 @@ jobs:
|
|||||||
|
|
||||||
- name: gcc-9-debug-asan-ubsan
|
- name: gcc-9-debug-asan-ubsan
|
||||||
continue-on-error: false
|
continue-on-error: false
|
||||||
node: 16
|
node: 18
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
BUILD_TOOLS: ON
|
BUILD_TOOLS: ON
|
||||||
BUILD_TYPE: Debug
|
BUILD_TYPE: Debug
|
||||||
@ -172,7 +172,7 @@ jobs:
|
|||||||
|
|
||||||
- name: clang-6.0-debug
|
- name: clang-6.0-debug
|
||||||
continue-on-error: false
|
continue-on-error: false
|
||||||
node: 16
|
node: 18
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
BUILD_TOOLS: ON
|
BUILD_TOOLS: ON
|
||||||
BUILD_TYPE: Debug
|
BUILD_TYPE: Debug
|
||||||
@ -182,7 +182,7 @@ jobs:
|
|||||||
|
|
||||||
- name: clang-15.0-debug-clang-tidy
|
- name: clang-15.0-debug-clang-tidy
|
||||||
continue-on-error: false
|
continue-on-error: false
|
||||||
node: 16
|
node: 18
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
BUILD_TOOLS: ON
|
BUILD_TOOLS: ON
|
||||||
BUILD_TYPE: Debug
|
BUILD_TYPE: Debug
|
||||||
@ -193,7 +193,7 @@ jobs:
|
|||||||
|
|
||||||
- name: conan-linux-debug-asan-ubsan
|
- name: conan-linux-debug-asan-ubsan
|
||||||
continue-on-error: false
|
continue-on-error: false
|
||||||
node: 16
|
node: 18
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
BUILD_TOOLS: ON
|
BUILD_TOOLS: ON
|
||||||
BUILD_TYPE: Release
|
BUILD_TYPE: Release
|
||||||
@ -204,7 +204,7 @@ jobs:
|
|||||||
|
|
||||||
- name: conan-linux-release
|
- name: conan-linux-release
|
||||||
continue-on-error: false
|
continue-on-error: false
|
||||||
node: 16
|
node: 18
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
BUILD_TOOLS: ON
|
BUILD_TOOLS: ON
|
||||||
BUILD_TYPE: Release
|
BUILD_TYPE: Release
|
||||||
@ -214,7 +214,7 @@ jobs:
|
|||||||
|
|
||||||
- name: gcc-12-release
|
- name: gcc-12-release
|
||||||
continue-on-error: false
|
continue-on-error: false
|
||||||
node: 16
|
node: 18
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
BUILD_TOOLS: ON
|
BUILD_TOOLS: ON
|
||||||
BUILD_TYPE: Release
|
BUILD_TYPE: Release
|
||||||
@ -225,7 +225,7 @@ jobs:
|
|||||||
|
|
||||||
- name: gcc-11-release
|
- name: gcc-11-release
|
||||||
continue-on-error: false
|
continue-on-error: false
|
||||||
node: 16
|
node: 18
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
BUILD_TOOLS: ON
|
BUILD_TOOLS: ON
|
||||||
BUILD_TYPE: Release
|
BUILD_TYPE: Release
|
||||||
@ -235,7 +235,7 @@ jobs:
|
|||||||
|
|
||||||
- name: gcc-10-release
|
- name: gcc-10-release
|
||||||
continue-on-error: false
|
continue-on-error: false
|
||||||
node: 16
|
node: 18
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
BUILD_TOOLS: ON
|
BUILD_TOOLS: ON
|
||||||
BUILD_TYPE: Release
|
BUILD_TYPE: Release
|
||||||
@ -244,7 +244,7 @@ jobs:
|
|||||||
|
|
||||||
- name: gcc-9-release
|
- name: gcc-9-release
|
||||||
continue-on-error: false
|
continue-on-error: false
|
||||||
node: 16
|
node: 18
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
BUILD_TOOLS: ON
|
BUILD_TOOLS: ON
|
||||||
BUILD_TYPE: Release
|
BUILD_TYPE: Release
|
||||||
@ -254,7 +254,7 @@ jobs:
|
|||||||
|
|
||||||
- name: gcc-9-conan-release-i686
|
- name: gcc-9-conan-release-i686
|
||||||
continue-on-error: false
|
continue-on-error: false
|
||||||
node: 16
|
node: 18
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
BUILD_TOOLS: ON
|
BUILD_TOOLS: ON
|
||||||
BUILD_TYPE: Release
|
BUILD_TYPE: Release
|
||||||
@ -267,7 +267,7 @@ jobs:
|
|||||||
|
|
||||||
- name: gcc-8-release
|
- name: gcc-8-release
|
||||||
continue-on-error: false
|
continue-on-error: false
|
||||||
node: 16
|
node: 18
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
BUILD_TOOLS: ON
|
BUILD_TOOLS: ON
|
||||||
BUILD_TYPE: Release
|
BUILD_TYPE: Release
|
||||||
@ -278,7 +278,7 @@ jobs:
|
|||||||
- name: conan-linux-release-node
|
- name: conan-linux-release-node
|
||||||
build_node_package: true
|
build_node_package: true
|
||||||
continue-on-error: false
|
continue-on-error: false
|
||||||
node: 18
|
node: 20
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
BUILD_TYPE: Release
|
BUILD_TYPE: Release
|
||||||
CCOMPILER: clang-6.0
|
CCOMPILER: clang-6.0
|
||||||
@ -289,7 +289,7 @@ jobs:
|
|||||||
- name: conan-linux-debug-node
|
- name: conan-linux-debug-node
|
||||||
build_node_package: true
|
build_node_package: true
|
||||||
continue-on-error: false
|
continue-on-error: false
|
||||||
node: 18
|
node: 20
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
BUILD_TYPE: Debug
|
BUILD_TYPE: Debug
|
||||||
CCOMPILER: clang-6.0
|
CCOMPILER: clang-6.0
|
||||||
@ -300,7 +300,7 @@ jobs:
|
|||||||
- name: conan-macos-x64-release-node
|
- name: conan-macos-x64-release-node
|
||||||
build_node_package: true
|
build_node_package: true
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
node: 18
|
node: 20
|
||||||
runs-on: macos-11
|
runs-on: macos-11
|
||||||
BUILD_TYPE: Release
|
BUILD_TYPE: Release
|
||||||
CCOMPILER: clang
|
CCOMPILER: clang
|
||||||
@ -312,7 +312,7 @@ jobs:
|
|||||||
- name: conan-macos-arm64-release-node
|
- name: conan-macos-arm64-release-node
|
||||||
build_node_package: true
|
build_node_package: true
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
node: 18
|
node: 20
|
||||||
runs-on: macos-11
|
runs-on: macos-11
|
||||||
BUILD_TYPE: Release
|
BUILD_TYPE: Release
|
||||||
CCOMPILER: clang
|
CCOMPILER: clang
|
||||||
@ -547,16 +547,6 @@ jobs:
|
|||||||
./src/benchmarks/rtree-bench ../test/data/monaco.osrm.ramIndex ../test/data/monaco.osrm.fileIndex ../test/data/monaco.osrm.nbg_nodes
|
./src/benchmarks/rtree-bench ../test/data/monaco.osrm.ramIndex ../test/data/monaco.osrm.fileIndex ../test/data/monaco.osrm.nbg_nodes
|
||||||
popd
|
popd
|
||||||
|
|
||||||
- name: Use Node 16
|
|
||||||
if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' && matrix.ENABLE_APPLE_SILICON != 'ON' }}
|
|
||||||
uses: actions/setup-node@v3
|
|
||||||
with:
|
|
||||||
node-version: 16
|
|
||||||
- name: Run Node package tests on Node 16
|
|
||||||
if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' && matrix.ENABLE_APPLE_SILICON != 'ON' }}
|
|
||||||
run: |
|
|
||||||
node --version
|
|
||||||
npm run nodejs-tests
|
|
||||||
- name: Use Node 18
|
- name: Use Node 18
|
||||||
if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' && matrix.ENABLE_APPLE_SILICON != 'ON' }}
|
if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' && matrix.ENABLE_APPLE_SILICON != 'ON' }}
|
||||||
uses: actions/setup-node@v3
|
uses: actions/setup-node@v3
|
||||||
@ -567,6 +557,16 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
node --version
|
node --version
|
||||||
npm run nodejs-tests
|
npm run nodejs-tests
|
||||||
|
- name: Use Node 20
|
||||||
|
if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' && matrix.ENABLE_APPLE_SILICON != 'ON' }}
|
||||||
|
uses: actions/setup-node@v3
|
||||||
|
with:
|
||||||
|
node-version: 20
|
||||||
|
- name: Run Node package tests on Node 20
|
||||||
|
if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' && matrix.ENABLE_APPLE_SILICON != 'ON' }}
|
||||||
|
run: |
|
||||||
|
node --version
|
||||||
|
npm run nodejs-tests
|
||||||
- name: Use Node latest
|
- name: Use Node latest
|
||||||
if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' && matrix.ENABLE_APPLE_SILICON != 'ON' }}
|
if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' && matrix.ENABLE_APPLE_SILICON != 'ON' }}
|
||||||
uses: actions/setup-node@v3
|
uses: actions/setup-node@v3
|
||||||
@ -591,15 +591,16 @@ jobs:
|
|||||||
lcov --directory . --capture --output-file coverage.info # capture coverage info
|
lcov --directory . --capture --output-file coverage.info # capture coverage info
|
||||||
lcov --remove coverage.info '/usr/*' --output-file coverage.info # filter out system
|
lcov --remove coverage.info '/usr/*' --output-file coverage.info # filter out system
|
||||||
lcov --list coverage.info #debug info
|
lcov --list coverage.info #debug info
|
||||||
# Uploading report to CodeCov
|
|
||||||
- name: Upload code coverage
|
# # Uploading report to CodeCov
|
||||||
if: ${{ matrix.ENABLE_COVERAGE == 'ON' }}
|
# - name: Upload code coverage
|
||||||
uses: codecov/codecov-action@v1
|
# if: ${{ matrix.ENABLE_COVERAGE == 'ON' }}
|
||||||
with:
|
# uses: codecov/codecov-action@v1
|
||||||
files: coverage.info
|
# with:
|
||||||
name: codecov-osrm-backend
|
# files: coverage.info
|
||||||
fail_ci_if_error: true
|
# name: codecov-osrm-backend
|
||||||
verbose: true
|
# fail_ci_if_error: true
|
||||||
|
# verbose: true
|
||||||
- name: Check Apple Silicon binary
|
- name: Check Apple Silicon binary
|
||||||
if: ${{ matrix.ENABLE_APPLE_SILICON == 'ON' }}
|
if: ${{ matrix.ENABLE_APPLE_SILICON == 'ON' }}
|
||||||
run: |
|
run: |
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
- CHANGED: Update actions/cache to v3. [#6420](https://github.com/Project-OSRM/osrm-backend/pull/6420)
|
- 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)
|
- 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)
|
- 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)
|
||||||
- NodeJS:
|
- NodeJS:
|
||||||
- CHANGED: Use node-api instead of NAN. [#6452](https://github.com/Project-OSRM/osrm-backend/pull/6452)
|
- CHANGED: Use node-api instead of NAN. [#6452](https://github.com/Project-OSRM/osrm-backend/pull/6452)
|
||||||
- Misc:
|
- Misc:
|
||||||
|
1197
package-lock.json
generated
1197
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -4,7 +4,7 @@
|
|||||||
"private": false,
|
"private": false,
|
||||||
"description": "The Open Source Routing Machine is a high performance routing engine written in C++ designed to run on OpenStreetMap data.",
|
"description": "The Open Source Routing Machine is a high performance routing engine written in C++ designed to run on OpenStreetMap data.",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@mapbox/node-pre-gyp": "^1.0.10"
|
"@mapbox/node-pre-gyp": "^1.0.11"
|
||||||
},
|
},
|
||||||
"browserify": {
|
"browserify": {
|
||||||
"transform": [
|
"transform": [
|
||||||
@ -31,7 +31,7 @@
|
|||||||
},
|
},
|
||||||
"homepage": "https://github.com/Project-OSRM/osrm-backend",
|
"homepage": "https://github.com/Project-OSRM/osrm-backend",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=4.0.0"
|
"node": ">=18.0.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/cli": "^7.18.10",
|
"@babel/cli": "^7.18.10",
|
||||||
|
Loading…
Reference in New Issue
Block a user