Radish alpha
r
radicle-ci-broker
rad:zwTxygwuz5LDGBq255RA2CbNGrz8
Radicle CI broker
Radicle
Git
Commits › aa5e1eb
chore: upgrade dependencies, fix problems found
Lars Wirzenius committed 7 months ago
commit aa5e1eb0084e8cc7dbb97acdeed37145f24ffe6c
parent 3782dc2
6 files changed +286 -45
modified .cargo/deny.toml
@@ -14,6 +14,7 @@ allow = [
    "Unicode-3.0",

    "BSD-3-Clause",

    "GPL-3.0-or-later",
+ 
    "Zlib",

]



[bans]
modified Cargo.lock
@@ -672,6 +672,12 @@ dependencies = [
]



[[package]]
+ 
name = "defer-heavy"
+ 
version = "0.1.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "5053691e3e6c0e5979cfb55503b7eb4b06531897b5c15b0f617110096b05a0e1"
+
+ 
[[package]]

name = "der"

version = "0.7.10"

source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -874,6 +880,12 @@ dependencies = [
]



[[package]]
+ 
name = "fast-glob"
+ 
version = "0.3.3"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "3afcf4effa2c44390b9912544582d5af29e10dc4c816c5dbebf748e1c7416faa"
+
+ 
[[package]]

name = "fastrand"

version = "2.3.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -924,6 +936,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"



[[package]]
+ 
name = "foldhash"
+ 
version = "0.1.5"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+
+ 
[[package]]

name = "form_urlencoded"

version = "1.2.2"

source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -966,7 +984,7 @@ dependencies = [
 "libc",

 "log",

 "rustversion",
- 
 "windows",
+ 
 "windows 0.48.0",

]



[[package]]
@@ -1032,8 +1050,18 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7428e0d6e549a9a613d6f019b839a0f5142c331295b79e119ca8f4faac145da1"

dependencies = [
- 
 "git-ref-format-core",
- 
 "git-ref-format-macro",
+ 
 "git-ref-format-core 0.3.1",
+ 
 "git-ref-format-macro 0.3.1",
+ 
]
+
+ 
[[package]]
+ 
name = "git-ref-format"
+ 
version = "0.4.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "c6162eaa58800412e548ab9e0d06dce1e30033b86c0d76ec533ce0268808da8e"
+ 
dependencies = [
+ 
 "git-ref-format-core 0.4.0",
+ 
 "git-ref-format-macro 0.4.0",

]



[[package]]
@@ -1047,18 +1075,40 @@ dependencies = [
]



[[package]]
+ 
name = "git-ref-format-core"
+ 
version = "0.4.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "ed188b0784192e09c03f731d5a9ca4066cae0578e71c041b235b9e233582d1de"
+ 
dependencies = [
+ 
 "serde",
+ 
 "thiserror 1.0.69",
+ 
]
+
+ 
[[package]]

name = "git-ref-format-macro"

version = "0.3.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "3b6ca5353accc201f6324dff744ba4660099546d4daf187ba868f07562e36ca4"

dependencies = [
- 
 "git-ref-format-core",
+ 
 "git-ref-format-core 0.3.1",

 "proc-macro-error",

 "quote",

 "syn 2.0.106",

]



[[package]]
+ 
name = "git-ref-format-macro"
+ 
version = "0.4.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "6ff61d62c2c3b3735d20d45db285bf471c39f2bab7ec5e993ac9df7786d56bdf"
+ 
dependencies = [
+ 
 "git-ref-format-core 0.4.0",
+ 
 "proc-macro-error2",
+ 
 "quote",
+ 
 "syn 2.0.106",
+ 
]
+
+ 
[[package]]

name = "git2"

version = "0.19.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1120,6 +1170,9 @@ name = "hashbrown"
version = "0.15.5"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+ 
dependencies = [
+ 
 "foldhash",
+ 
]



[[package]]

name = "hashlink"
@@ -1131,6 +1184,15 @@ dependencies = [
]



[[package]]
+ 
name = "hashlink"
+ 
version = "0.10.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
+ 
dependencies = [
+ 
 "hashbrown 0.15.5",
+ 
]
+
+ 
[[package]]

name = "heck"

version = "0.5.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1474,10 +1536,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2eb25a7ab146f4058d67a74dfea52e25c133c575f08ce5851da97d224e3ad8d"

dependencies = [

 "doc-comment",
- 
 "hashlink",
+ 
 "hashlink 0.9.1",

 "serde",

 "serde_path_to_error",
- 
 "yaml-rust2",
+ 
 "yaml-rust2 0.9.0",
+ 
]
+
+ 
[[package]]
+ 
name = "marked-yaml"
+ 
version = "0.8.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "3a76cf4e66a8ffccfce983161b0faafe61a5ef03fe875ef2e3deb897e4e915fa"
+ 
dependencies = [
+ 
 "doc-comment",
+ 
 "hashlink 0.10.0",
+ 
 "serde",
+ 
 "serde_path_to_error",
+ 
 "yaml-rust2 0.10.4",

]



[[package]]
@@ -1867,6 +1942,28 @@ dependencies = [
]



[[package]]
+ 
name = "proc-macro-error-attr2"
+ 
version = "2.0.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
+ 
dependencies = [
+ 
 "proc-macro2",
+ 
 "quote",
+ 
]
+
+ 
[[package]]
+ 
name = "proc-macro-error2"
+ 
version = "2.0.1"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
+ 
dependencies = [
+ 
 "proc-macro-error-attr2",
+ 
 "proc-macro2",
+ 
 "quote",
+ 
 "syn 2.0.106",
+ 
]
+
+ 
[[package]]

name = "proc-macro2"

version = "1.0.101"

source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1889,6 +1986,19 @@ dependencies = [
]



[[package]]
+ 
name = "pulldown-cmark"
+ 
version = "0.13.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "1e8bbe1a966bd2f362681a44f6edce3c2310ac21e4d5067a6e7ec396297a6ea0"
+ 
dependencies = [
+ 
 "bitflags",
+ 
 "getopts",
+ 
 "memchr",
+ 
 "pulldown-cmark-escape",
+ 
 "unicase",
+ 
]
+
+ 
[[package]]

name = "pulldown-cmark-escape"

version = "0.11.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1941,17 +2051,19 @@ checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"


[[package]]

name = "radicle"
- 
version = "0.16.1"
+ 
version = "0.18.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "d5fe953b25a8f5c24baf1019f746912e7453746d617a1af04cb347904d241005"
+ 
checksum = "d7619819155800f9a358b19f42ba07f878c9af017fa1ed92a59fbf3ab21c3aa6"

dependencies = [

 "amplify",

 "base64 0.21.7",

 "bytesize",

 "crossbeam-channel",

 "cyphernet",
+ 
 "fast-glob",

 "fastrand",

 "git2",
+ 
 "indexmap",

 "libc",

 "localtime",

 "log",
@@ -1960,7 +2072,7 @@ dependencies = [
 "qcheck",

 "radicle-cob",

 "radicle-crypto",
- 
 "radicle-git-ext",
+ 
 "radicle-git-ext 0.8.1",

 "radicle-ssh",

 "serde",

 "serde-untagged",
@@ -1970,6 +2082,7 @@ dependencies = [
 "tempfile",

 "thiserror 1.0.69",

 "unicode-normalization",
+ 
 "winpipe",

]



[[package]]
@@ -1988,7 +2101,7 @@ dependencies = [
 "qcheck-macros",

 "radicle",

 "radicle-crypto",
- 
 "radicle-git-ext",
+ 
 "radicle-git-ext 0.9.0",

 "radicle-job",

 "radicle-surf",

 "regex",
@@ -2012,18 +2125,17 @@ dependencies = [


[[package]]

name = "radicle-cob"
- 
version = "0.14.0"
+ 
version = "0.15.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "6e9c90efa7a3febd01d33ed2e72cb12296c971ce03efa243d11c01520fcc1be8"
+ 
checksum = "5514b7b58e4300a766132905486ebb743248ee0444fbaf38af05f501851b7d89"

dependencies = [

 "fastrand",

 "git2",

 "log",

 "nonempty 0.9.0",
- 
 "once_cell",

 "radicle-crypto",

 "radicle-dag",
- 
 "radicle-git-ext",
+ 
 "radicle-git-ext 0.8.1",

 "serde",

 "serde_json",

 "signature 2.2.0",
@@ -2032,9 +2144,9 @@ dependencies = [


[[package]]

name = "radicle-crypto"
- 
version = "0.12.0"
+ 
version = "0.13.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "d16d9e1403a6c3073dce14f3ed893f430bb67d7af6a07cc7fe4b81907025ba22"
+ 
checksum = "8cd6a14a4326268a9504e0018f1afb100fda7932342a85bd2a06e19b20e84eaa"

dependencies = [

 "amplify",

 "cyphernet",
@@ -2042,7 +2154,7 @@ dependencies = [
 "fastrand",

 "multibase",

 "qcheck",
- 
 "radicle-git-ext",
+ 
 "radicle-git-ext 0.8.1",

 "radicle-ssh",

 "serde",

 "signature 2.2.0",
@@ -2067,7 +2179,7 @@ version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "4b78c26e67d1712ad5a0c602ae3b236609461372ac04e200bda359fe4a1c6650"

dependencies = [
- 
 "git-ref-format",
+ 
 "git-ref-format 0.3.1",

 "git2",

 "percent-encoding",

 "radicle-std-ext",
@@ -2076,10 +2188,23 @@ dependencies = [
]



[[package]]
+ 
name = "radicle-git-ext"
+ 
version = "0.9.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "46d0fcd9103cb66d5450aed216bffb4c8458ede46aeef9ec77c649b93d29d99b"
+ 
dependencies = [
+ 
 "git-ref-format 0.4.0",
+ 
 "git2",
+ 
 "percent-encoding",
+ 
 "radicle-std-ext",
+ 
 "thiserror 1.0.69",
+ 
]
+
+ 
[[package]]

name = "radicle-job"
- 
version = "0.2.0"
+ 
version = "0.3.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "70b2de1bb748a1b587f759137058c4ae917753652b5fb4ae3baee991a7b31a68"
+ 
checksum = "0ed32cf4f87836a54cce564f90c28cf57f96decc294e0ffd50c53e5475d4fb99"

dependencies = [

 "clap",

 "indexmap",
@@ -2096,13 +2221,12 @@ dependencies = [


[[package]]

name = "radicle-ssh"
- 
version = "0.9.0"
+ 
version = "0.10.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "fbee758010fb64482be4b18591fbeb3cbc15b16450d143edf4edb5484c7366c6"
+ 
checksum = "216e9e1259d8c857cdb38b2f832fb117e8e26478f110b9a2690bca20b87ec9c5"

dependencies = [
- 
 "byteorder",
- 
 "log",

 "thiserror 1.0.69",
+ 
 "winpipe",

 "zeroize",

]
@@ -2124,7 +2248,7 @@ dependencies = [
 "git2",

 "log",

 "nonempty 0.9.0",
- 
 "radicle-git-ext",
+ 
 "radicle-git-ext 0.8.1",

 "radicle-std-ext",

 "serde",

 "tar",
@@ -2231,7 +2355,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec49775c5134c7e4befdedecaf112bb72964baa9b24bedfc79b54c3ca0ee9f77"

dependencies = [

 "anyhow",
- 
 "marked-yaml",
+ 
 "marked-yaml 0.7.2",

 "serde",

 "tempfile",

 "textwrap",
@@ -2627,9 +2751,36 @@ dependencies = [
 "html-escape",

 "lazy_static",

 "line-col",
- 
 "marked-yaml",
+ 
 "marked-yaml 0.7.2",

 "pikchr",
- 
 "pulldown-cmark",
+ 
 "pulldown-cmark 0.12.2",
+ 
 "regex",
+ 
 "roadmap",
+ 
 "serde",
+ 
 "serde_json",
+ 
 "slug",
+ 
 "tera",
+ 
 "thiserror 2.0.16",
+ 
 "tracing",
+ 
 "walkdir",
+ 
]
+
+ 
[[package]]
+ 
name = "subplot"
+ 
version = "0.13.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "7a2d7d684d11cc4256f675dd026f2999762fdd407dcdfae7ed06005370359dc6"
+ 
dependencies = [
+ 
 "anyhow",
+ 
 "base64 0.22.1",
+ 
 "descape",
+ 
 "getopts",
+ 
 "html-escape",
+ 
 "lazy_static",
+ 
 "line-col",
+ 
 "marked-yaml 0.8.0",
+ 
 "pikchr",
+ 
 "pulldown-cmark 0.13.0",

 "regex",

 "roadmap",

 "serde",
@@ -2643,11 +2794,11 @@ dependencies = [


[[package]]

name = "subplot-build"
- 
version = "0.12.0"
+ 
version = "0.13.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "008b31a93442526100369310bf717117df546b8259b7043aebcfdffa84af35bf"
+ 
checksum = "1a1e4b117c4e8177c359b14cbea439ff70c4d8c91f81f1361c49987f8890e8c7"

dependencies = [
- 
 "subplot",
+ 
 "subplot 0.13.0",

 "tracing",

]
@@ -2680,7 +2831,7 @@ dependencies = [
 "culpa",

 "proc-macro2",

 "quote",
- 
 "subplot",
+ 
 "subplot 0.12.0",

 "syn 2.0.106",

]
@@ -2713,6 +2864,12 @@ dependencies = [
]



[[package]]
+ 
name = "sync-ptr"
+ 
version = "0.1.4"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "2b115b4cc742d11625f50e0e48ab15baf6fa548c2ec33a8d4113711886316a4f"
+
+ 
[[package]]

name = "synstructure"

version = "0.13.2"

source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3296,6 +3453,51 @@ dependencies = [
]



[[package]]
+ 
name = "windows"
+ 
version = "0.58.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
+ 
dependencies = [
+ 
 "windows-core",
+ 
 "windows-targets 0.52.6",
+ 
]
+
+ 
[[package]]
+ 
name = "windows-core"
+ 
version = "0.58.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
+ 
dependencies = [
+ 
 "windows-implement",
+ 
 "windows-interface",
+ 
 "windows-result",
+ 
 "windows-strings",
+ 
 "windows-targets 0.52.6",
+ 
]
+
+ 
[[package]]
+ 
name = "windows-implement"
+ 
version = "0.58.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
+ 
dependencies = [
+ 
 "proc-macro2",
+ 
 "quote",
+ 
 "syn 2.0.106",
+ 
]
+
+ 
[[package]]
+ 
name = "windows-interface"
+ 
version = "0.58.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
+ 
dependencies = [
+ 
 "proc-macro2",
+ 
 "quote",
+ 
 "syn 2.0.106",
+ 
]
+
+ 
[[package]]

name = "windows-link"

version = "0.1.3"

source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3308,6 +3510,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"



[[package]]
+ 
name = "windows-result"
+ 
version = "0.2.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+ 
dependencies = [
+ 
 "windows-targets 0.52.6",
+ 
]
+
+ 
[[package]]
+ 
name = "windows-strings"
+ 
version = "0.1.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+ 
dependencies = [
+ 
 "windows-result",
+ 
 "windows-targets 0.52.6",
+ 
]
+
+ 
[[package]]

name = "windows-sys"

version = "0.52.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3539,6 +3760,19 @@ dependencies = [
]



[[package]]
+ 
name = "winpipe"
+ 
version = "0.1.1"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "1ccf671d62d1bd0c913d9059e69bb4a6b51f7a4c899ab83c62d921e35f206053"
+ 
dependencies = [
+ 
 "defer-heavy",
+ 
 "log",
+ 
 "rand",
+ 
 "sync-ptr",
+ 
 "windows 0.58.0",
+ 
]
+
+ 
[[package]]

name = "wit-bindgen"

version = "0.45.1"

source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3568,7 +3802,18 @@ checksum = "2a1a1c0bc9823338a3bdf8c61f994f23ac004c6fa32c08cd152984499b445e8d"
dependencies = [

 "arraydeque",

 "encoding_rs",
- 
 "hashlink",
+ 
 "hashlink 0.9.1",
+ 
]
+
+ 
[[package]]
+ 
name = "yaml-rust2"
+ 
version = "0.10.4"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "2462ea039c445496d8793d052e13787f2b90e750b833afee748e601c17621ed9"
+ 
dependencies = [
+ 
 "arraydeque",
+ 
 "encoding_rs",
+ 
 "hashlink 0.10.0",

]



[[package]]
modified Cargo.toml
@@ -17,9 +17,9 @@ duration-str = "0.12.0"
html-page = "0.4.0"

libc = "0.2.175"

nonempty = "0.11.0"
- 
radicle-crypto = "0.12.0"
- 
radicle-git-ext = "0.8.0"
- 
radicle-job = "0.2.0"
+ 
radicle-crypto = "0.13.0"
+ 
radicle-git-ext = "0.9.0"
+ 
radicle-job = "0.3.0"

radicle-surf = { version = "0.22.0", default-features = false, features = ["serde"] }

regex = "1.10.5"

rss = "2.0.9"
@@ -39,7 +39,7 @@ uuid = { version = "1.10.0", features = ["v4"] }
valuable = { version = "0.1.0", features = ["derive"] }



[dependencies.radicle]
- 
version = "0.16.1"
+ 
version = "0.18.0"

features = ["default", "test"]



[dev-dependencies]
@@ -49,4 +49,4 @@ qcheck = { version = "1", default-features = false }
qcheck-macros = { version = "1", default-features = false }



[build-dependencies]
- 
subplot-build = "0.12.0"
+ 
subplot-build = "0.13.0"
modified build.rs
@@ -26,9 +26,4 @@ fn main() {
        env!("CARGO_PKG_VERSION")

    );

    println!("cargo:rustc-rerun-if-changed=.git/HEAD");
-
- 
    if let Err(e) = subplot_build::codegen("ci-broker.subplot") {
- 
        eprintln!("failed to generate code with Subplot: {e}");
- 
        std::process::exit(1);
- 
    }

}
modified src/bin/cibtoolcmd/message.rs
@@ -148,7 +148,7 @@ pub enum MessageError {
    Repo(#[from] radicle::storage::RepositoryError),



    #[error(transparent)]
- 
    Git(#[from] radicle_git_ext::ref_format::Error),
+ 
    Git(#[from] radicle::git::fmt::Error),



    #[error(transparent)]

    Message(#[from] radicle_ci_broker::msg::MessageError),
modified tests/subplot.rs
@@ -1 +1 @@
- 
include!(concat!(env!("OUT_DIR"), "/ci-broker.rs"));
+ 
subplotlib::codegen!("ci-broker.subplot");