Skip to content

Commit c21226a

Browse files
authored
Update crucible (#7672)
Bump crucible rev to pick up: - Remove rusqlite dependency from crucible-common - Fix a test flake - Bitpack per-block slot data in memory - Use `div_ceil` instead of `/ 8` - Add repair server dynamometer (and other 'Update Rust crate' PRs)
1 parent 14ed184 commit c21226a

File tree

3 files changed

+17
-63
lines changed

3 files changed

+17
-63
lines changed

Cargo.lock

Lines changed: 7 additions & 53 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -362,10 +362,10 @@ crossterm = { version = "0.28.1", features = ["event-stream"] }
362362
# NOTE: if you change the pinned revision of the `crucible` dependencies, you
363363
# must also update the references in package-manifest.toml to match the new
364364
# revision.
365-
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "d2d8f8ad449df7e2befb7ee2723a442dd74b9b72" }
366-
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "d2d8f8ad449df7e2befb7ee2723a442dd74b9b72" }
367-
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "d2d8f8ad449df7e2befb7ee2723a442dd74b9b72" }
368-
crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "d2d8f8ad449df7e2befb7ee2723a442dd74b9b72" }
365+
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "81a3528adacdbde18fcbf3938247fef17233db11" }
366+
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "81a3528adacdbde18fcbf3938247fef17233db11" }
367+
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "81a3528adacdbde18fcbf3938247fef17233db11" }
368+
crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "81a3528adacdbde18fcbf3938247fef17233db11" }
369369
# NOTE: See above!
370370
csv = "1.3.1"
371371
curve25519-dalek = "4"

package-manifest.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -579,10 +579,10 @@ only_for_targets.image = "standard"
579579
# 3. Use source.type = "manual" instead of "prebuilt"
580580
source.type = "prebuilt"
581581
source.repo = "crucible"
582-
source.commit = "d2d8f8ad449df7e2befb7ee2723a442dd74b9b72"
582+
source.commit = "81a3528adacdbde18fcbf3938247fef17233db11"
583583
# The SHA256 digest is automatically posted to:
584584
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible.sha256.txt
585-
source.sha256 = "9ff97404090498c5ac84e2b3b55f43466cb40a285da87af8c761b165b8ca912c"
585+
source.sha256 = "3a3ccacf4dba99d61055791eed9a20ddb4c7ca1e34f3aecd6089b174a858ad0a"
586586
output.type = "zone"
587587
output.intermediate_only = true
588588

@@ -591,10 +591,10 @@ service_name = "crucible_pantry_prebuilt"
591591
only_for_targets.image = "standard"
592592
source.type = "prebuilt"
593593
source.repo = "crucible"
594-
source.commit = "d2d8f8ad449df7e2befb7ee2723a442dd74b9b72"
594+
source.commit = "81a3528adacdbde18fcbf3938247fef17233db11"
595595
# The SHA256 digest is automatically posted to:
596596
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-pantry.sha256.txt
597-
source.sha256 = "23e77a98fecb24a1d46ecd5f829e8ca48d90ff17f61b38a9302800cc1df9d0ee"
597+
source.sha256 = "a5eb5e1b65dfed8f601509cda8b876ab77f58034b8d441b47cb89772f2e9fd01"
598598
output.type = "zone"
599599
output.intermediate_only = true
600600

@@ -608,10 +608,10 @@ service_name = "crucible_dtrace"
608608
only_for_targets.image = "standard"
609609
source.type = "prebuilt"
610610
source.repo = "crucible"
611-
source.commit = "d2d8f8ad449df7e2befb7ee2723a442dd74b9b72"
611+
source.commit = "81a3528adacdbde18fcbf3938247fef17233db11"
612612
# The SHA256 digest is automatically posted to:
613613
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-dtrace.sha256.txt
614-
source.sha256 = "024cf5e70fd09a1d039ea6a35a59ca1d8ec9b82d1685bd74e8f6efd402dcc629"
614+
source.sha256 = "860be02b375a7ba116795285a23a8022e1db6720fc9a789a08888f31ffeb5c07"
615615
output.type = "tarball"
616616

617617
# Refer to

0 commit comments

Comments
 (0)