From 03ea7660e19d9eff80730a975bc3febbdc84b64d Mon Sep 17 00:00:00 2001 From: Matthew Jackson <1085847+MattJackson@users.noreply.github.com> Date: Tue, 6 Oct 2026 10:51:31 -0700 Subject: [PATCH] fleet: busbar pin daf4c0275e -> 7c6d8b4b4d (lane-p4-fleet-doors-2); Cargo.lock re-derived from busbar's lock at the pin; Cargo.toml, deny.toml and declares.json the busbar-release render at the pin (store contract ABI 3) busbar supports store ABI v3; the earlier render (before busbar-release #165) stated 4, which the oracle refuses at pack time. The render at the pin (busbar-release 8903a1d) states 3. The suite's host adapter renders unchanged. xtask plugin-gates parity at the pin: 0 findings; cargo deny: clean. --- .busbar-ref | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/consumer-verify.yml | 2 +- .github/workflows/release.yml | 4 ++-- .github/workflows/repin.yml | 2 +- Cargo.lock | 26 +++++++++++++------------- Cargo.toml | 16 ++++++++-------- deny.toml | 2 +- store-postgres/declares.json | 4 ++-- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.busbar-ref b/.busbar-ref index a483331..955d648 100644 --- a/.busbar-ref +++ b/.busbar-ref @@ -1 +1 @@ -daf4c0275e734fe1988053e241486042351b8fb3 1.6.0 +7c6d8b4b4d0e352dc57777c04f49571ec5b5be23 1.6.0 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 064a1e3..d3d38bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ permissions: jobs: ci: - uses: GetBusbar/busbar/.github/workflows/plugin-ci.yml@daf4c0275e734fe1988053e241486042351b8fb3 + uses: GetBusbar/busbar/.github/workflows/plugin-ci.yml@7c6d8b4b4d0e352dc57777c04f49571ec5b5be23 with: service: postgres busbar_checkout: true diff --git a/.github/workflows/consumer-verify.yml b/.github/workflows/consumer-verify.yml index fca9fd2..3b267c4 100644 --- a/.github/workflows/consumer-verify.yml +++ b/.github/workflows/consumer-verify.yml @@ -21,7 +21,7 @@ permissions: jobs: consumer: - uses: GetBusbar/busbar/.github/workflows/plugin-consumer-verify.yml@daf4c0275e734fe1988053e241486042351b8fb3 + uses: GetBusbar/busbar/.github/workflows/plugin-consumer-verify.yml@7c6d8b4b4d0e352dc57777c04f49571ec5b5be23 with: version: ${{ inputs.version || '' }} asset_prefix: busbar-store-postgres diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 23c1567..17efee2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,7 +25,7 @@ jobs: secrets: inherit release: needs: ci - uses: GetBusbar/busbar/.github/workflows/plugin-release.yml@daf4c0275e734fe1988053e241486042351b8fb3 + uses: GetBusbar/busbar/.github/workflows/plugin-release.yml@7c6d8b4b4d0e352dc57777c04f49571ec5b5be23 with: plugin_crate: busbar-store-postgres-plugin manifest_name: busbar-store-postgres @@ -41,7 +41,7 @@ jobs: consumer-verify: needs: release if: ${{ !cancelled() }} - uses: GetBusbar/busbar/.github/workflows/plugin-consumer-verify.yml@daf4c0275e734fe1988053e241486042351b8fb3 + uses: GetBusbar/busbar/.github/workflows/plugin-consumer-verify.yml@7c6d8b4b4d0e352dc57777c04f49571ec5b5be23 with: version: ${{ github.ref_name }} asset_prefix: busbar-store-postgres diff --git a/.github/workflows/repin.yml b/.github/workflows/repin.yml index df06a5e..1c94a08 100644 --- a/.github/workflows/repin.yml +++ b/.github/workflows/repin.yml @@ -28,7 +28,7 @@ permissions: jobs: repin: - uses: GetBusbar/busbar/.github/workflows/plugin-repin.yml@daf4c0275e734fe1988053e241486042351b8fb3 + uses: GetBusbar/busbar/.github/workflows/plugin-repin.yml@7c6d8b4b4d0e352dc57777c04f49571ec5b5be23 with: busbar_sha: ${{ github.event.client_payload.sha || inputs.busbar_sha }} busbar_version: ${{ github.event.client_payload.version || inputs.busbar_version }} diff --git a/Cargo.lock b/Cargo.lock index c771c21..aec9a7d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -219,7 +219,7 @@ checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" [[package]] name = "busbar-contract" version = "1.6.0" -source = "git+https://www.github.com/GetBusbar/busbar?rev=daf4c0275e734fe1988053e241486042351b8fb3#daf4c0275e734fe1988053e241486042351b8fb3" +source = "git+https://www.github.com/GetBusbar/busbar?rev=7c6d8b4b4d0e352dc57777c04f49571ec5b5be23#7c6d8b4b4d0e352dc57777c04f49571ec5b5be23" dependencies = [ "async-trait", "base64 0.22.1", @@ -242,7 +242,7 @@ dependencies = [ [[package]] name = "busbar-core-connector" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar?rev=daf4c0275e734fe1988053e241486042351b8fb3#daf4c0275e734fe1988053e241486042351b8fb3" +source = "git+https://github.com/GetBusbar/busbar?rev=7c6d8b4b4d0e352dc57777c04f49571ec5b5be23#7c6d8b4b4d0e352dc57777c04f49571ec5b5be23" dependencies = [ "busbar-contract", "busbar-kernel", @@ -266,7 +266,7 @@ dependencies = [ [[package]] name = "busbar-kernel" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar?rev=daf4c0275e734fe1988053e241486042351b8fb3#daf4c0275e734fe1988053e241486042351b8fb3" +source = "git+https://github.com/GetBusbar/busbar?rev=7c6d8b4b4d0e352dc57777c04f49571ec5b5be23#7c6d8b4b4d0e352dc57777c04f49571ec5b5be23" dependencies = [ "arc-swap", "async-trait", @@ -316,7 +316,7 @@ dependencies = [ [[package]] name = "busbar-kernel-audit" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar?rev=daf4c0275e734fe1988053e241486042351b8fb3#daf4c0275e734fe1988053e241486042351b8fb3" +source = "git+https://github.com/GetBusbar/busbar?rev=7c6d8b4b4d0e352dc57777c04f49571ec5b5be23#7c6d8b4b4d0e352dc57777c04f49571ec5b5be23" dependencies = [ "busbar-contract", "ed25519-dalek", @@ -327,7 +327,7 @@ dependencies = [ [[package]] name = "busbar-kernel-breaker" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar?rev=daf4c0275e734fe1988053e241486042351b8fb3#daf4c0275e734fe1988053e241486042351b8fb3" +source = "git+https://github.com/GetBusbar/busbar?rev=7c6d8b4b4d0e352dc57777c04f49571ec5b5be23#7c6d8b4b4d0e352dc57777c04f49571ec5b5be23" dependencies = [ "busbar-contract", "httpdate", @@ -336,7 +336,7 @@ dependencies = [ [[package]] name = "busbar-kernel-egress" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar?rev=daf4c0275e734fe1988053e241486042351b8fb3#daf4c0275e734fe1988053e241486042351b8fb3" +source = "git+https://github.com/GetBusbar/busbar?rev=7c6d8b4b4d0e352dc57777c04f49571ec5b5be23#7c6d8b4b4d0e352dc57777c04f49571ec5b5be23" dependencies = [ "busbar-contract", "bytes", @@ -346,7 +346,7 @@ dependencies = [ [[package]] name = "busbar-kernel-identity" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar?rev=daf4c0275e734fe1988053e241486042351b8fb3#daf4c0275e734fe1988053e241486042351b8fb3" +source = "git+https://github.com/GetBusbar/busbar?rev=7c6d8b4b4d0e352dc57777c04f49571ec5b5be23#7c6d8b4b4d0e352dc57777c04f49571ec5b5be23" dependencies = [ "busbar-contract", "hex", @@ -358,7 +358,7 @@ dependencies = [ [[package]] name = "busbar-kernel-ledger" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar?rev=daf4c0275e734fe1988053e241486042351b8fb3#daf4c0275e734fe1988053e241486042351b8fb3" +source = "git+https://github.com/GetBusbar/busbar?rev=7c6d8b4b4d0e352dc57777c04f49571ec5b5be23#7c6d8b4b4d0e352dc57777c04f49571ec5b5be23" dependencies = [ "busbar-contract", "ring", @@ -368,7 +368,7 @@ dependencies = [ [[package]] name = "busbar-kernel-scope" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar?rev=daf4c0275e734fe1988053e241486042351b8fb3#daf4c0275e734fe1988053e241486042351b8fb3" +source = "git+https://github.com/GetBusbar/busbar?rev=7c6d8b4b4d0e352dc57777c04f49571ec5b5be23#7c6d8b4b4d0e352dc57777c04f49571ec5b5be23" dependencies = [ "busbar-contract", ] @@ -376,7 +376,7 @@ dependencies = [ [[package]] name = "busbar-kernel-wal" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar?rev=daf4c0275e734fe1988053e241486042351b8fb3#daf4c0275e734fe1988053e241486042351b8fb3" +source = "git+https://github.com/GetBusbar/busbar?rev=7c6d8b4b4d0e352dc57777c04f49571ec5b5be23#7c6d8b4b4d0e352dc57777c04f49571ec5b5be23" dependencies = [ "busbar-contract", "ring", @@ -385,7 +385,7 @@ dependencies = [ [[package]] name = "busbar-plugin-loader" version = "1.5.0" -source = "git+https://github.com/GetBusbar/busbar?rev=daf4c0275e734fe1988053e241486042351b8fb3#daf4c0275e734fe1988053e241486042351b8fb3" +source = "git+https://github.com/GetBusbar/busbar?rev=7c6d8b4b4d0e352dc57777c04f49571ec5b5be23#7c6d8b4b4d0e352dc57777c04f49571ec5b5be23" dependencies = [ "busbar-contract", "busbar-kernel-ledger", @@ -572,9 +572,9 @@ dependencies = [ [[package]] name = "ctutils" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5515a3834141de9eafb9717ad39eea8247b5674e6066c404e8c4b365d2a29e" +checksum = "03bb0e1cc970d482d121d9a1744999169b69a07470b3d644a7894e53fcaf4574" dependencies = [ "cmov", ] diff --git a/Cargo.toml b/Cargo.toml index 156b8fc..e0ce20b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,8 +10,8 @@ # `.busbar-ref`; no sibling-checkout path dependency ships in any manifest. # # THIRD-PARTY VERSIONS ARE THE FLEET'S, NOT THIS REPO'S. The table below is busbar's own root -# `[workspace.dependencies]` (third-party rows) at busbar daf4c0275e734fe1988053e241486042351b8fb3, followed by the plugin-only rows -# of busbar's `.github/fleet/deps.toml` at daf4c0275e734fe1988053e241486042351b8fb3. A member takes a crate with +# `[workspace.dependencies]` (third-party rows) at busbar 7c6d8b4b4d0e352dc57777c04f49571ec5b5be23, followed by the plugin-only rows +# of busbar's `.github/fleet/deps.toml` at 7c6d8b4b4d0e352dc57777c04f49571ec5b5be23. A member takes a crate with # `{ workspace = true }` (adding features if it needs them); a crate in neither table is a new # `deps.toml` row in busbar first. CI holds this repo's Cargo.lock to busbar's lock at the pin. [workspace] @@ -29,14 +29,14 @@ publish = false repository = "https://github.com/GetBusbar/busbar-store-postgres" [workspace.dependencies] -busbar-contract = { git = "https://github.com/GetBusbar/busbar", rev = "daf4c0275e734fe1988053e241486042351b8fb3" } -busbar-plugin-loader = { git = "https://github.com/GetBusbar/busbar", rev = "daf4c0275e734fe1988053e241486042351b8fb3" } +busbar-contract = { git = "https://github.com/GetBusbar/busbar", rev = "7c6d8b4b4d0e352dc57777c04f49571ec5b5be23" } +busbar-plugin-loader = { git = "https://github.com/GetBusbar/busbar", rev = "7c6d8b4b4d0e352dc57777c04f49571ec5b5be23" } # THE SUITE'S HOST CONNECTOR (dev-only; store-postgres-plugin/tests/support/conformance_host.rs, # rendered because the declares file states network needs): busbar's connector and its TLS # test kit at the pin, and the transport framers those needs name, at the revs busbar links. -busbar-core-connector = { git = "https://github.com/GetBusbar/busbar", rev = "daf4c0275e734fe1988053e241486042351b8fb3", features = ["test-support"] } +busbar-core-connector = { git = "https://github.com/GetBusbar/busbar", rev = "7c6d8b4b4d0e352dc57777c04f49571ec5b5be23", features = ["test-support"] } busbar-transport-tcp = { git = "https://github.com/GetBusbar/busbar-transport-tcp", rev = "89d08ebcb91e5b2d4001b667fba151d9bc09d22d" } -# busbar's root [workspace.dependencies], third-party rows, at daf4c0275e734fe1988053e241486042351b8fb3 +# busbar's root [workspace.dependencies], third-party rows, at 7c6d8b4b4d0e352dc57777c04f49571ec5b5be23 a2a-lf = "0.3.0" a2a-pb = "0.2.0" arc-swap = "1" @@ -112,7 +112,7 @@ url = "2" webpki = { package = "rustls-webpki", version = "0.103", default-features = false, features = ["std", "ring"] } webpki-roots = "1" zeroize = "1" -# busbar .github/fleet/deps.toml [plugin-deps], at daf4c0275e734fe1988053e241486042351b8fb3 +# busbar .github/fleet/deps.toml [plugin-deps], at 7c6d8b4b4d0e352dc57777c04f49571ec5b5be23 ldap3 = { version = "0.12", default-features = false, features = ["sync"] } mysql = { version = "28", default-features = false, features = ["minimal-rust"] } mysql_common = { version = "0.35", default-features = false } @@ -127,4 +127,4 @@ ulid = "1" # patches them to its own tree. The source is busbar spelled through www.github.com: Cargo # refuses a patch that names the source it patches. [patch."https://github.com/GetBusbar/busbar"] -busbar-contract = { git = "https://www.github.com/GetBusbar/busbar", rev = "daf4c0275e734fe1988053e241486042351b8fb3" } +busbar-contract = { git = "https://www.github.com/GetBusbar/busbar", rev = "7c6d8b4b4d0e352dc57777c04f49571ec5b5be23" } diff --git a/deny.toml b/deny.toml index b935439..54b318d 100644 --- a/deny.toml +++ b/deny.toml @@ -1,5 +1,5 @@ # RENDERED by `busbar-release plugin sync` from GetBusbar/busbar-release template/ and busbar's -# `.github/fleet/deps.toml` at daf4c0275e734fe1988053e241486042351b8fb3; a hand edit is overwritten by the next sync. CI runs +# `.github/fleet/deps.toml` at 7c6d8b4b4d0e352dc57777c04f49571ec5b5be23; a hand edit is overwritten by the next sync. CI runs # `cargo deny check` on it (busbar's plugin-ci.yml at the pin). The license allowlist is busbar's own; # the one reviewed git source is busbar itself, at the pin. [graph] diff --git a/store-postgres/declares.json b/store-postgres/declares.json index 2b63b04..7767f00 100644 --- a/store-postgres/declares.json +++ b/store-postgres/declares.json @@ -1,7 +1,7 @@ { "contract_abi": { - "min": 4, - "max": 4 + "min": 3, + "max": 3 }, "needs": [ "tcp"