From a6affc5ddaa49fab906ac70c043b9692e0314c6f Mon Sep 17 00:00:00 2001 From: Ryan Goodfellow Date: Thu, 2 May 2024 18:27:33 -0700 Subject: [PATCH] bump deps --- Cargo.lock | 4 ++-- Cargo.toml | 4 ++-- package-manifest.toml | 24 ++++++++++++------------ tools/dendrite_openapi_version | 2 +- tools/dendrite_stub_checksums | 6 +++--- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 92caf9c500..f3137aff77 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1610,7 +1610,7 @@ dependencies = [ [[package]] name = "ddm-admin-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/maghemite?rev=964d17ab9239d82e92d5ad553dee94ac4a6e6e69#964d17ab9239d82e92d5ad553dee94ac4a6e6e69" +source = "git+https://github.com/oxidecomputer/maghemite?rev=b6619ea590a3c15e5f5c5015917f96f73a20d9b1#b6619ea590a3c15e5f5c5015917f96f73a20d9b1" dependencies = [ "percent-encoding", "progenitor", @@ -4287,7 +4287,7 @@ dependencies = [ [[package]] name = "mg-admin-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/maghemite?rev=964d17ab9239d82e92d5ad553dee94ac4a6e6e69#964d17ab9239d82e92d5ad553dee94ac4a6e6e69" +source = "git+https://github.com/oxidecomputer/maghemite?rev=b6619ea590a3c15e5f5c5015917f96f73a20d9b1#b6619ea590a3c15e5f5c5015917f96f73a20d9b1" dependencies = [ "anyhow", "chrono", diff --git a/Cargo.toml b/Cargo.toml index 18cc8b9a5d..13cbbb4ee4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -269,8 +269,8 @@ macaddr = { version = "1.0.1", features = ["serde_std"] } maplit = "1.0.2" mockall = "0.12" newtype_derive = "0.1.6" -mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "964d17ab9239d82e92d5ad553dee94ac4a6e6e69" } -ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "964d17ab9239d82e92d5ad553dee94ac4a6e6e69" } +mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "b6619ea590a3c15e5f5c5015917f96f73a20d9b1" } +ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "b6619ea590a3c15e5f5c5015917f96f73a20d9b1" } multimap = "0.10.0" nexus-client = { path = "clients/nexus-client" } nexus-config = { path = "nexus-config" } diff --git a/package-manifest.toml b/package-manifest.toml index d0af6b2cca..ae78510bef 100644 --- a/package-manifest.toml +++ b/package-manifest.toml @@ -533,10 +533,10 @@ source.repo = "maghemite" # `tools/maghemite_openapi_version`. Failing to do so will cause a failure when # building `ddm-admin-client` (which will instruct you to update # `tools/maghemite_openapi_version`). -source.commit = "964d17ab9239d82e92d5ad553dee94ac4a6e6e69" +source.commit = "b6619ea590a3c15e5f5c5015917f96f73a20d9b1" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image//maghemite.sha256.txt -source.sha256 = "7f9f23b5bc9255027fda60f93c1e94d97373e705b68db7548d1ee508abb97a27" +source.sha256 = "7ea53d29739254a25e26893c05a388be79e0d056d23eb841732822a7ffac2255" output.type = "tarball" [package.mg-ddm] @@ -549,10 +549,10 @@ source.repo = "maghemite" # `tools/maghemite_openapi_version`. Failing to do so will cause a failure when # building `ddm-admin-client` (which will instruct you to update # `tools/maghemite_openapi_version`). -source.commit = "964d17ab9239d82e92d5ad553dee94ac4a6e6e69" +source.commit = "b6619ea590a3c15e5f5c5015917f96f73a20d9b1" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image//mg-ddm.sha256.txt -source.sha256 = "387bd9999fb0c154a36744b5eb8f32047f1e735b9319d84021dfa6713d9d3371" +source.sha256 = "49b08566a3a77b6dbd20f69d19cdd16bf6780f8df491b974d5fa1fbf205d4ba4" output.type = "zone" output.intermediate_only = true @@ -564,10 +564,10 @@ source.repo = "maghemite" # `tools/maghemite_openapi_version`. Failing to do so will cause a failure when # building `ddm-admin-client` (which will instruct you to update # `tools/maghemite_openapi_version`). -source.commit = "964d17ab9239d82e92d5ad553dee94ac4a6e6e69" +source.commit = "b6619ea590a3c15e5f5c5015917f96f73a20d9b1" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image//mg-ddm.sha256.txt -source.sha256 = "b37ea3bba2341c788edaa9ca46441c543d714c9e99a6fcdde9a523f338873ecf" +source.sha256 = "b6da6b8d6d9ad1f869dde8cef10ab2bb67819ee8eed840f17c2a6025e3ddb103" output.type = "zone" output.intermediate_only = true @@ -613,8 +613,8 @@ only_for_targets.image = "standard" # 2. Copy dendrite.tar.gz from dendrite/out to omicron/out source.type = "prebuilt" source.repo = "dendrite" -source.commit = "bc73cc7f2b0401c2c72c9408347c79687b0bab5c" -source.sha256 = "215d95f0ddbaaa3386390716feb4d763972456c256bd7053b96624ed0d4b98c2" +source.commit = "3b84ea6516cafb4595a6f2a668df16c1a501b687" +source.sha256 = "1a18379522da75c034d66d15cf2e50a0d7289a746ef7c8a0ad98c4f61403f29b" output.type = "zone" output.intermediate_only = true @@ -638,8 +638,8 @@ only_for_targets.image = "standard" # 2. Copy the output zone image from dendrite/out to omicron/out source.type = "prebuilt" source.repo = "dendrite" -source.commit = "bc73cc7f2b0401c2c72c9408347c79687b0bab5c" -source.sha256 = "a4ad35f84166e27633f0b8b226f7a4aa49aebd307d2c587decaad1c229816ed1" +source.commit = "3b84ea6516cafb4595a6f2a668df16c1a501b687" +source.sha256 = "470e61b4652992da882ef10dd1511599a9cffe885d75c9924ee38e0900677ba7" output.type = "zone" output.intermediate_only = true @@ -656,8 +656,8 @@ only_for_targets.image = "standard" # 2. Copy dendrite.tar.gz from dendrite/out to omicron/out/dendrite-softnpu.tar.gz source.type = "prebuilt" source.repo = "dendrite" -source.commit = "bc73cc7f2b0401c2c72c9408347c79687b0bab5c" -source.sha256 = "08088c89a810af002f5176ee4d54cfcda447165b5504ff16eee6da885bec58ba" +source.commit = "3b84ea6516cafb4595a6f2a668df16c1a501b687" +source.sha256 = "8a7cc20bcca7498c1e83eb6f898e967635e69089c1bb4f86f7acdf99f7b1f353" output.type = "zone" output.intermediate_only = true diff --git a/tools/dendrite_openapi_version b/tools/dendrite_openapi_version index 2b14722f42..a00d2be7a1 100644 --- a/tools/dendrite_openapi_version +++ b/tools/dendrite_openapi_version @@ -1,2 +1,2 @@ -COMMIT="bc73cc7f2b0401c2c72c9408347c79687b0bab5c" +COMMIT="3b84ea6516cafb4595a6f2a668df16c1a501b687" SHA2="fc397e254dc150850fba12013df147aa9b23296056fb4d93f65c1806e25b0823" diff --git a/tools/dendrite_stub_checksums b/tools/dendrite_stub_checksums index 0c2f5479d2..18cfd54470 100644 --- a/tools/dendrite_stub_checksums +++ b/tools/dendrite_stub_checksums @@ -1,3 +1,3 @@ -CIDL_SHA256_ILLUMOS="215d95f0ddbaaa3386390716feb4d763972456c256bd7053b96624ed0d4b98c2" -CIDL_SHA256_LINUX_DPD="af9f56716f46c4f3b5ff4591fa8df7405da4a48e30bb827e68c91c2416176722" -CIDL_SHA256_LINUX_SWADM="aed4a76d7552bfd521b61426023817958d19e95e92a209cf1f0c4ea89547ce1f" +CIDL_SHA256_ILLUMOS="1a18379522da75c034d66d15cf2e50a0d7289a746ef7c8a0ad98c4f61403f29b" +CIDL_SHA256_LINUX_DPD="c255370062ce616f6fce5630fad7a1fbfa63aa7db964aeb6de410ba4a4bc3193" +CIDL_SHA256_LINUX_SWADM="7899b1603518489b2276f9d9043107a267060e3b05be51f08002adf3d118a7c9"