Skip to content

Commit

Permalink
Merge branch 'master' into drop_old_cmake_policy
Browse files Browse the repository at this point in the history
  • Loading branch information
DennisOSRM committed May 5, 2024
2 parents 70a337a + befd9dc commit c0e4166
Show file tree
Hide file tree
Showing 4 changed files with 676 additions and 601 deletions.
67 changes: 34 additions & 33 deletions .github/workflows/osrm-backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- run: cmake --version
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
- run: node --version
- run: npm --version
- name: Prepare environment
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
- name: Enable Node.js cache
uses: actions/cache@v3
with:
Expand Down Expand Up @@ -147,7 +147,7 @@ jobs:
include:
- name: gcc-9-debug-cov
continue-on-error: false
node: 16
node: 18
runs-on: ubuntu-20.04
BUILD_TOOLS: ON
BUILD_TYPE: Debug
Expand All @@ -158,7 +158,7 @@ jobs:

- name: gcc-9-debug-asan-ubsan
continue-on-error: false
node: 16
node: 18
runs-on: ubuntu-20.04
BUILD_TOOLS: ON
BUILD_TYPE: Debug
Expand All @@ -172,7 +172,7 @@ jobs:

- name: clang-6.0-debug
continue-on-error: false
node: 16
node: 18
runs-on: ubuntu-20.04
BUILD_TOOLS: ON
BUILD_TYPE: Debug
Expand All @@ -182,7 +182,7 @@ jobs:

- name: clang-15.0-debug-clang-tidy
continue-on-error: false
node: 16
node: 18
runs-on: ubuntu-22.04
BUILD_TOOLS: ON
BUILD_TYPE: Debug
Expand All @@ -193,7 +193,7 @@ jobs:

- name: conan-linux-debug-asan-ubsan
continue-on-error: false
node: 16
node: 18
runs-on: ubuntu-20.04
BUILD_TOOLS: ON
BUILD_TYPE: Release
Expand All @@ -204,7 +204,7 @@ jobs:

- name: conan-linux-release
continue-on-error: false
node: 16
node: 18
runs-on: ubuntu-20.04
BUILD_TOOLS: ON
BUILD_TYPE: Release
Expand All @@ -214,7 +214,7 @@ jobs:

- name: gcc-12-release
continue-on-error: false
node: 16
node: 18
runs-on: ubuntu-22.04
BUILD_TOOLS: ON
BUILD_TYPE: Release
Expand All @@ -225,7 +225,7 @@ jobs:

- name: gcc-11-release
continue-on-error: false
node: 16
node: 18
runs-on: ubuntu-20.04
BUILD_TOOLS: ON
BUILD_TYPE: Release
Expand All @@ -235,7 +235,7 @@ jobs:

- name: gcc-10-release
continue-on-error: false
node: 16
node: 18
runs-on: ubuntu-20.04
BUILD_TOOLS: ON
BUILD_TYPE: Release
Expand All @@ -244,7 +244,7 @@ jobs:

- name: gcc-9-release
continue-on-error: false
node: 16
node: 18
runs-on: ubuntu-20.04
BUILD_TOOLS: ON
BUILD_TYPE: Release
Expand All @@ -254,7 +254,7 @@ jobs:

- name: gcc-9-conan-release-i686
continue-on-error: false
node: 16
node: 18
runs-on: ubuntu-20.04
BUILD_TOOLS: ON
BUILD_TYPE: Release
Expand All @@ -267,7 +267,7 @@ jobs:

- name: gcc-8-release
continue-on-error: false
node: 16
node: 18
runs-on: ubuntu-20.04
BUILD_TOOLS: ON
BUILD_TYPE: Release
Expand All @@ -278,7 +278,7 @@ jobs:
- name: conan-linux-release-node
build_node_package: true
continue-on-error: false
node: 18
node: 20
runs-on: ubuntu-20.04
BUILD_TYPE: Release
CCOMPILER: clang-6.0
Expand All @@ -289,7 +289,7 @@ jobs:
- name: conan-linux-debug-node
build_node_package: true
continue-on-error: false
node: 18
node: 20
runs-on: ubuntu-20.04
BUILD_TYPE: Debug
CCOMPILER: clang-6.0
Expand All @@ -300,7 +300,7 @@ jobs:
- name: conan-macos-x64-release-node
build_node_package: true
continue-on-error: true
node: 18
node: 20
runs-on: macos-11
BUILD_TYPE: Release
CCOMPILER: clang
Expand All @@ -312,7 +312,7 @@ jobs:
- name: conan-macos-arm64-release-node
build_node_package: true
continue-on-error: true
node: 18
node: 20
runs-on: macos-11
BUILD_TYPE: Release
CCOMPILER: clang
Expand Down Expand Up @@ -547,22 +547,22 @@ jobs:
./src/benchmarks/rtree-bench ../test/data/monaco.osrm.ramIndex ../test/data/monaco.osrm.fileIndex ../test/data/monaco.osrm.nbg_nodes
popd
- name: Use Node 16
- name: Use Node 18
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
node-version: 18
- name: Run Node package tests on Node 18
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 20
if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' && matrix.ENABLE_APPLE_SILICON != 'ON' }}
uses: actions/setup-node@v3
with:
node-version: 18
- name: Run Node package tests on Node 18
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
Expand Down Expand Up @@ -591,15 +591,16 @@ jobs:
lcov --directory . --capture --output-file coverage.info # capture coverage info
lcov --remove coverage.info '/usr/*' --output-file coverage.info # filter out system
lcov --list coverage.info #debug info
# Uploading report to CodeCov
- name: Upload code coverage
if: ${{ matrix.ENABLE_COVERAGE == 'ON' }}
uses: codecov/codecov-action@v1
with:
files: coverage.info
name: codecov-osrm-backend
fail_ci_if_error: true
verbose: true
# # Uploading report to CodeCov
# - name: Upload code coverage
# if: ${{ matrix.ENABLE_COVERAGE == 'ON' }}
# uses: codecov/codecov-action@v1
# with:
# files: coverage.info
# name: codecov-osrm-backend
# fail_ci_if_error: true
# verbose: true
- name: Check Apple Silicon binary
if: ${{ matrix.ENABLE_APPLE_SILICON == 'ON' }}
run: |
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
- 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)
- 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:
- CHANGED: Use node-api instead of NAN. [#6452](https://github.com/Project-OSRM/osrm-backend/pull/6452)
- Misc:
Expand Down
Loading

0 comments on commit c0e4166

Please sign in to comment.