Show diff of dars.lock if it's out of date - #6657
Open
mrdziuban wants to merge 2 commits into
Open
Conversation
meiersi-da
approved these changes
Aug 4, 2026
meiersi-da
left a comment
meiersi-da
left a comment
Contributor
There was a problem hiding this comment.
Thanks. Approving with suggestions: https://neilmitchell.blogspot.com/2019/04/code-review-approve-with-suggestions.html
Fixes canton-network#5899 This updates `DarLockChecker.scala` to shell out to `diff` to get the difference between the current lock file and its expected contents, and includes the output in the error message. Signed-off-by: Matt Dziuban <mrdziuban@gmail.com>
mrdziuban
force-pushed
the
mrdziuban/diff-dars-lock/5899
branch
from
August 4, 2026 12:05
7af7428 to
4dd9d2c
Compare
Signed-off-by: Matt Dziuban <mrdziuban@gmail.com>
Contributor
Author
|
Pushed a fix for the sbt output failure -- sbt 1.4.3 changed the text from "... were spent in garbage collection" to "... were spent in GC" (sbt/sbt@3c25657) |
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
6 participants
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.
Fixes #5899
This updates
DarLockChecker.scalato shell out todiffto get the difference between the current lock file and its expected contents, and includes the output in the error message.@meiersi-da let me know if you'd prefer an approach that doesn't shell out to
diff.Pull Request Checklist
Cluster Testing
/cluster_teston this PR to request it, and ping someone with access to the DA-internal system to approve it./upgrade_teston this PR to request it, and ping someone with access to the DA-internal system to approve it./hdm_teston this PR to request it, and ping someone with access to the DA-internal system to approve it./lsu_teston this PR to request it, and ping someone with access to the DA-internal system to approve it.PR Guidelines
Fixes #n, and mention issues worked on using#nMerge Guidelines