fix(deps): use build_folder_vars in tsan profile to prevent CMakeUserPresets re-inclusion#468
Merged
Conversation
✅ Dependency Audit
See the Security tab for detailed findings. Workflow: Dependency Audit |
Security Scan Results
Recommendations
Workflow: Security Scanning |
mvillmow
force-pushed
the
324-auto-impl
branch
2 times, most recently
from
8a938e1 to
1983c57
Compare
…Presets re-inclusion Add `user.keystone.sanitizer=tsan` and `tools.cmake.cmake_layout:build_folder_vars` to the tsan Conan profile so Conan generates the preset name "conan-debug-tsan" instead of "conan-debug", eliminating the duplicate-preset collision with the debug build in CMakeUserPresets.json. This fix is idempotent and holds even when `conan install` is invoked directly, bypassing `just`. Remove the now-unnecessary post-install cleanup steps (rm + remove-preset-include.py) from deps-tsan. Closes #324 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
user.keystone.sanitizer=tsanandtools.cmake.cmake_layout:build_folder_vars=["settings.build_type", "user.keystone.sanitizer"]toconan/profiles/tsanso Conan generates preset nameconan-debug-tsaninstead ofconan-debug, eliminating the duplicate-preset collision with the plain debug build inCMakeUserPresets.json.conan installis run directly (bypassingjust), addressing the root cause described in deps-tsan recipe doesn't prevent CMakeUserPresets.json re-inclusion #324.rm -f build/tsan/CMakePresets.jsonandpython3 scripts/remove-preset-include.py ...) from thedeps-tsanjustfile recipe.Test plan
conan install . --output-folder=build/tsan --profile=conan/profiles/tsan --build=missingdirectly and verifyCMakeUserPresets.jsoncontainsconan-debug-tsan(notconan-debug).just deps-tsanand verify no collision with a pre-existing debug build.just build-tsanto confirm the TSan build completes successfully.just format-check— passes.Closes #324
🤖 Generated with Claude Code