Skip to content

Commit

Permalink
cpp: fix windows CI (#728)
Browse files Browse the repository at this point in the history
  • Loading branch information
james-rms authored Nov 16, 2022
1 parent dc6561d commit 7320046
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -209,10 +209,7 @@ jobs:
with:
python-version: 3.7
- run: pip install conan==1.53.0
- run: conan config init
- run: conan editable add ./mcap mcap/0.6.0
- run: conan install test --install-folder test/build/Debug -s compiler.cppstd=17 -s build_type=Debug --build missing
- run: conan build test --build-folder test/build/Debug
- run: bash build.sh --build-tests-only
- run: ./test/build/Debug/bin/unit-tests

typescript:
Expand Down
15 changes: 9 additions & 6 deletions cpp/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@ set -e
conan config init

conan editable add ./mcap mcap/0.7.0
conan install bench --install-folder bench/build/Release \
-s compiler.cppstd=17 -s build_type=Release --build missing
conan install examples --install-folder examples/build/Release \
-s compiler.cppstd=17 -s build_type=Release --build missing
conan install test --install-folder test/build/Debug \
-s compiler.cppstd=17 -s build_type=Debug --build missing

conan build examples --build-folder examples/build/Release
conan build bench --build-folder bench/build/Release
if [ "$1" != "--build-tests-only" ]; then
conan install bench --install-folder bench/build/Release \
-s compiler.cppstd=17 -s build_type=Release --build missing
conan install examples --install-folder examples/build/Release \
-s compiler.cppstd=17 -s build_type=Release --build missing
conan build examples --build-folder examples/build/Release
conan build bench --build-folder bench/build/Release
fi

conan build test --build-folder test/build/Debug

0 comments on commit 7320046

Please sign in to comment.