File tree Expand file tree Collapse file tree 3 files changed +25
-96
lines changed Expand file tree Collapse file tree 3 files changed +25
-96
lines changed Original file line number Diff line number Diff line change @@ -46,15 +46,32 @@ jobs:
46
46
echo PUBLISH=$([[ "${GITHUB_REF:-}" == "refs/tags/v${PACKAGE_JSON_VERSION}" ]] && echo "On" || echo "Off") >> $GITHUB_ENV
47
47
- run : npm install --ignore-scripts
48
48
- run : npm link --ignore-scripts
49
- - uses : microsoft/setup-msbuild@v2
50
49
- name : Build
51
- run : |
52
- .\scripts\ci\windows-build.bat
53
- - name : Run node tests
54
50
shell : bash
55
51
run : |
56
- ./lib/binding/osrm-datastore.exe test/data/ch/monaco.osrm
57
- node test/nodejs/index.js
52
+ mkdir build
53
+ cd build
54
+ cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_CONAN=ON -DENABLE_NODE_BINDINGS=ON ..
55
+ cmake --build . --config Release
56
+
57
+ # TODO: MSVC goes out of memory when building our tests
58
+ # - name: Run tests
59
+ # shell: bash
60
+ # run: |
61
+ # cd build
62
+ # cmake --build . --config Release --target tests
63
+ # # TODO: run tests
64
+ # - name: Run node tests
65
+ # shell: bash
66
+ # run: |
67
+ # ./lib/binding/osrm-extract.exe -p profiles/car.lua test/data/monaco.osm.pbf
68
+
69
+ # mkdir -p test/data/ch
70
+ # cp test/data/monaco.osrm* test/data/ch/
71
+ # ./lib/binding/osrm-contract.exe test/data/ch/monaco.osrm
72
+
73
+ # ./lib/binding/osrm-datastore.exe test/data/ch/monaco.osrm
74
+ # node test/nodejs/index.js
58
75
- name : Build Node package
59
76
shell : bash
60
77
run : ./scripts/ci/node_package.sh
@@ -203,6 +220,7 @@ jobs:
203
220
CUCUMBER_TIMEOUT : 60000
204
221
ENABLE_CLANG_TIDY : ON
205
222
223
+
206
224
- name : clang-14-release
207
225
continue-on-error : false
208
226
node : 18
Original file line number Diff line number Diff line change @@ -55,7 +55,7 @@ function(_get_msvc_ide_version result)
55
55
set (${result} 15 PARENT_SCOPE )
56
56
elseif (NOT MSVC_VERSION VERSION_LESS 1920 AND MSVC_VERSION VERSION_LESS 1930 )
57
57
set (${result} 16 PARENT_SCOPE )
58
- elseif (NOT MSVC_VERSION VERSION_LESS 1930 AND MSVC_VERSION VERSION_LESS 1940 )
58
+ elseif (NOT MSVC_VERSION VERSION_LESS 1930 AND MSVC_VERSION VERSION_LESS 1950 )
59
59
set (${result} 17 PARENT_SCOPE )
60
60
else ()
61
61
message (FATAL_ERROR "Conan: Unknown MSVC compiler version [${MSVC_VERSION} ]" )
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments