Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- name: Configure
run: bin/with-toolchain ${{ matrix.toolchain }} cmake . -B .build -DCMAKE_BUILD_TYPE=Debug -DDD_TRACE_BUILD_TESTING=1
run: bin/with-toolchain ${{ matrix.toolchain }} cmake . -B .build --preset ci-clang
- name: Build
run: cmake --build ${BUILD_DIR} -j -v
- name: Test
Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:
- name: Build
run: |
& 'C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Common7\\Tools\\Launch-VsDevShell.ps1' -arch ${{ matrix.arch }}
cmake --preset=ci-windows -B build -DCMAKE_BUILD_TYPE=Debug .
cmake --preset=ci-msvc -B build -DCMAKE_BUILD_TYPE=Debug .
cmake --build build -j $env:MAKE_JOB_COUNT -v
- name: Test
run: |
Expand Down
20 changes: 15 additions & 5 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
"$schema": "https://cmake.org/cmake/help/latest/_downloads/3e2d73bff478d88a7de0de736ba5e361/schema.json",
"configurePresets": [
{
"name": "ci-windows",
"displayName": "CI Windows",
"name": "ci-msvc",
"displayName": "CI MSVC",
"generator": "Ninja",
"cacheVariables": {
"CMAKE_COMPILE_WARNING_AS_ERROR": "1",
"CMAKE_COMPILE_WARNING_AS_ERROR": "ON",
"BUILD_SHARED_LIBS": "OFF",
"DD_TRACE_STATIC_CRT": "1",
"DD_TRACE_BUILD_TESTING": "1"
"DD_TRACE_BUILD_TESTING": "1",
Comment thread
dmehala marked this conversation as resolved.
Outdated
"DD_TRACE_ENABLE_SANITIZE": "ON"
}
},
{
Expand All @@ -26,11 +27,20 @@
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
"DD_TRACE_ENABLE_SANITIZE": "OFF",
"DD_TRACE_ENABLE_SANITIZE": "ON",
"DD_TRACE_BUILD_TESTING": "ON",
"DD_TRACE_BUILD_EXAMPLES": "ON",
"DD_TRACE_BUILD_FUZZERS": "OFF"
}
},
{
"name": "ci-clang",
"displayName": "CI Clang",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"DD_TRACE_ENABLE_SANITIZE": "ON",
"DD_TRACE_BUILD_TESTING": "ON"
}
}
]
}
Loading