Skip to content

Commit 0cbb23a

Browse files
Fix Windows CI: update conan.cmake and disable unit tests as temporary workaround for OOM issues (#6930)
1 parent a2915f7 commit 0cbb23a

File tree

3 files changed

+25
-96
lines changed

3 files changed

+25
-96
lines changed

.github/workflows/osrm-backend.yml

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,32 @@ jobs:
4646
echo PUBLISH=$([[ "${GITHUB_REF:-}" == "refs/tags/v${PACKAGE_JSON_VERSION}" ]] && echo "On" || echo "Off") >> $GITHUB_ENV
4747
- run: npm install --ignore-scripts
4848
- run: npm link --ignore-scripts
49-
- uses: microsoft/setup-msbuild@v2
5049
- name: Build
51-
run: |
52-
.\scripts\ci\windows-build.bat
53-
- name: Run node tests
5450
shell: bash
5551
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
5875
- name: Build Node package
5976
shell: bash
6077
run: ./scripts/ci/node_package.sh
@@ -203,6 +220,7 @@ jobs:
203220
CUCUMBER_TIMEOUT: 60000
204221
ENABLE_CLANG_TIDY: ON
205222

223+
206224
- name: clang-14-release
207225
continue-on-error: false
208226
node: 18

cmake/conan.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ function(_get_msvc_ide_version result)
5555
set(${result} 15 PARENT_SCOPE)
5656
elseif(NOT MSVC_VERSION VERSION_LESS 1920 AND MSVC_VERSION VERSION_LESS 1930)
5757
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)
5959
set(${result} 17 PARENT_SCOPE)
6060
else()
6161
message(FATAL_ERROR "Conan: Unknown MSVC compiler version [${MSVC_VERSION}]")

scripts/ci/windows-build.bat

Lines changed: 0 additions & 89 deletions
This file was deleted.

0 commit comments

Comments
 (0)