save

Author: SiarheiFedartsou

.github/workflows/osrm-backend.yml

@@ -525,34 +525,34 @@ jobs:
       uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node }}
-    # - name: Enable Node.js cache
-    #   uses: actions/cache@v2
-    #   with:
-    #     path: ~/.npm
-    #     key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-    #     restore-keys: |
-    #       ${{ runner.os }}-node-
-    # - name: Enable compiler cache
-    #   uses: actions/cache@v2
-    #   with:
-    #     path: ~/.ccache
-    #     key: ccache-${{ matrix.name }}-${{ github.sha }}
-    #     restore-keys: |
-    #       ccache-${{ matrix.name }}-
-    # - name: Enable Conan cache
-    #   uses: actions/cache@v2
-    #   with:
-    #     path: ~/.conan
-    #     key: v6-conan-${{ matrix.name }}-${{ github.sha }}
-    #     restore-keys: |
-    #       v6-conan-${{ matrix.name }}-
-    # - name: Enable test cache
-    #   uses: actions/cache@v2
-    #   with:
-    #     path: ${{github.workspace}}/test/cache
-    #     key: v3-test-${{ matrix.name }}-${{ github.sha }}
-    #     restore-keys: |
-    #       v3-test-${{ matrix.name }}-
+    - name: Enable Node.js cache
+      uses: actions/cache@v2
+      with:
+        path: ~/.npm
+        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+        restore-keys: |
+          ${{ runner.os }}-node-
+    - name: Enable compiler cache
+      uses: actions/cache@v2
+      with:
+        path: ~/.ccache
+        key: ccache-${{ matrix.name }}-${{ github.sha }}
+        restore-keys: |
+          ccache-${{ matrix.name }}-
+    - name: Enable Conan cache
+      uses: actions/cache@v2
+      with:
+        path: ~/.conan
+        key: v6-conan-${{ matrix.name }}-${{ github.sha }}
+        restore-keys: |
+          v6-conan-${{ matrix.name }}-
+    - name: Enable test cache
+      uses: actions/cache@v2
+      with:
+        path: ${{github.workspace}}/test/cache
+        key: v3-test-${{ matrix.name }}-${{ github.sha }}
+        restore-keys: |
+          v3-test-${{ matrix.name }}-
 
     - name: Prepare environment
       run: |
@@ -675,6 +675,7 @@ jobs:
         cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
         make --jobs=${JOBS}
         popd
+    - run: npm link
     - run: osrm-routed-js --version
     - name: Run all tests
       if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY != 'ON' && matrix.ENABLE_APPLE_SILICON != 'ON' }}

routed-js/OSRMWrapper.js

@@ -3,9 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OSRMWrapper = void 0;
+exports.OSRMWrapper = exports.version = void 0;
 const util_1 = __importDefault(require("util"));
 const OSRM = require('../lib/index.js');
+exports.version = OSRM.version;
 class OSRMWrapper {
     constructor(osrmOptions) {
         this.osrm = new OSRM(osrmOptions);

routed-js/OSRMWrapper.ts

@@ -1,6 +1,8 @@
 import util from 'util';
 const OSRM = require('../lib/index.js');
 
+export const version = OSRM.version;
+
 export class OSRMWrapper {
     private readonly osrm: typeof OSRM;
 

routed-js/routed.js

@@ -36,8 +36,7 @@ async function main() {
         .strict()
         .argv;
     if (argv.version) {
-        // TODO: print real version
-        process.stdout.write('v5.27.0\n');
+        process.stdout.write(`v${OSRMWrapper_1.version}\n`);
         return;
     }
     if (argv._.length == 0 && !argv.shared_memory) {

routed-js/routed.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import Fastify, { FastifyReply, FastifyRequest } from 'fastify';
-import { OSRMWrapper } from './OSRMWrapper';
+import { OSRMWrapper, version as OSRMVersion } from './OSRMWrapper';
 import yargs from 'yargs/yargs';
 import { routeSchema, nearestSchema, tableSchema, tripSchema, matchSchema, tileSchema, parseQueryString, parseCoordinatesAndFormat } from './schema';
 import { ServiceHandler } from './ServiceHandler';
@@ -35,8 +35,7 @@ async function main() {
         .argv;
 
     if (argv.version) {
-    // TODO: print real version
-        process.stdout.write('v5.27.0\n');
+        process.stdout.write(`v${OSRMVersion}\n`);
         return;
     }