Repository navigation
BUG: Reject extra JSON content in strict comparisons #567
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Changes from all commits
275c8d0
4083503
492bc40
6f8ee01
bb84de0
2023676
d8f51b0
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -292,6 +292,15 @@ endif() | |
|
|
||
| add_subdirectory("libsrc") | ||
|
|
||
| if(BUILD_TESTING) | ||
| add_test(NAME dcmqi_jsoncompare | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
🤖 Comment generated by Claude (Claude Code), posted on behalf of @fedorov.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hi @fedorov edorov, thank you again for the thorough review. I've addressed all seven points in commit When you have a chance, would you mind taking another look? I'd be happy to address anything that remains. Thanks again! |
||
| COMMAND "${Python3_EXECUTABLE}" -B | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/util/test_jsoncompare.py" | ||
| ) | ||
| set_tests_properties(dcmqi_jsoncompare PROPERTIES | ||
| LABELS "segmentation;paramap;tid1500;jsoncompare") | ||
| endif() | ||
|
|
||
| if(DCMQI_BUILD_APPS) | ||
| add_subdirectory("apps") | ||
| endif() | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice fix adding
id: build. One remaining gap: the save step (line 191) runs after Test and Package, behind!cancelled(). If 8000 a cold Intel build plus the full test run hits the 90-minute job timeout, the job is cancelled and the cache is never saved, so the next run starts cold again. Moving the cache save to right after the build step would avoid that.Related, though outside this diff:
.github/workflows/cmake-win.ymlhas the same bug this PR fixes on macOS. Its save step (line 128) checkssteps.build.outcome, but the "Build dcmqi" step (line 83) has noid: build, so Windows never saves its dependency cache. Adding the id there, in this PR or a follow-up, would fix it.🤖 Comment generated by Claude (Claude Code), posted on behalf of @fedorov.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Addressed both caching points in
bb84de0. On macOS, dependency cache saving runs immediately after a successful build, before dciodvfy checks, tests, and packaging. Windows now hasid: buildand likewise saves dependencies immediately after the build. The original cache keys, paths, and conditions are preserved. Both workflow YAML files parse and the new ordering was checked locally.