Radish alpha
r
radicle-native-ci
rad:z3qg5TKmN83afz2fj9z3fQjU8vaYE
Radicle CI adapter for native CI
Radicle
Git
Commits › 4916f6b
chore: update dependencies to current versions
Lars Wirzenius committed 1 month ago
commit 4916f6b1c05fb84d4b35e85c460bcb1781917153
parent ec5d6bd
8 files changed +207 -143
modified .cargo/deny.toml
@@ -1,6 +1,5 @@
[advisories]

ignore = [
- 
  "RUSTSEC-2024-0370",

]
@@ -8,7 +7,6 @@ ignore = [
allow = [

  "Apache-2.0",

  "BSD-3-Clause",
- 
  "GPL-3.0-or-later",

  "MIT",

  "MIT-0",

  "Unicode-3.0",
modified Cargo.lock
@@ -804,6 +804,12 @@ dependencies = [
]



[[package]]
+ 
name = "dyn-clone"
+ 
version = "1.0.20"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
+
+ 
[[package]]

name = "ec25519"

version = "0.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1071,32 +1077,12 @@ dependencies = [


[[package]]

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

version = "0.6.0"

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

checksum = "ed6913a77cee9e231cab93577c9a5eea84a1344ab39294d91dc075b3c24499d0"

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

]



[[package]]
@@ -1111,23 +1097,11 @@ dependencies = [


[[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 0.3.1",
- 
 "proc-macro-error",
- 
 "quote",
- 
 "syn 2.0.117",
- 
]
-
- 
[[package]]
- 
name = "git-ref-format-macro"

version = "0.6.0"

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

checksum = "4e730f09c82961c28f5465b83da0aa5c2716156ce57da33a1fa51bbd560aa5f7"

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

 "proc-macro-error2",

 "quote",

 "syn 2.0.117",
@@ -1135,9 +1109,9 @@ dependencies = [


[[package]]

name = "git2"
- 
version = "0.19.0"
+ 
version = "0.20.4"

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

dependencies = [

 "bitflags",

 "libc",
@@ -1249,15 +1223,6 @@ dependencies = [


[[package]]

name = "html-page"
- 
version = "0.4.2"
- 
source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "f4b604f568a3dd058afd11d04f6274112e8504acb545430e26f97a4f79829329"
- 
dependencies = [
- 
 "html-escape",
- 
]
-
- 
[[package]]
- 
name = "html-page"

version = "0.5.0"

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

checksum = "76181545288d8db56d49096dd1506b0d8db00ff18d385930ccb8b9c6f8391723"
@@ -1490,9 +1455,9 @@ checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112"


[[package]]

name = "libgit2-sys"
- 
version = "0.17.0+1.8.1"
+ 
version = "0.18.3+1.9.2"

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

dependencies = [

 "cc",

 "libc",
@@ -1549,15 +1514,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"



[[package]]
- 
name = "localtime"
- 
version = "1.3.1"
- 
source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "016a009e0bb8ba6e3229fb74bf11a8fe6ef24542cc6ef35ef38863ac13f96d87"
- 
dependencies = [
- 
 "serde",
- 
]
-
- 
[[package]]

name = "log"

version = "0.4.29"

source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1631,6 +1587,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"



[[package]]
+ 
name = "memoffset"
+ 
version = "0.9.1"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+ 
dependencies = [
+ 
 "autocfg",
+ 
]
+
+ 
[[package]]

name = "miniz_oxide"

version = "0.8.9"

source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2000,30 +1965,6 @@ dependencies = [
]



[[package]]
- 
name = "proc-macro-error"
- 
version = "1.0.4"
- 
source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
- 
dependencies = [
- 
 "proc-macro-error-attr",
- 
 "proc-macro2",
- 
 "quote",
- 
 "syn 1.0.109",
- 
 "version_check",
- 
]
-
- 
[[package]]
- 
name = "proc-macro-error-attr"
- 
version = "1.0.4"
- 
source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
- 
dependencies = [
- 
 "proc-macro2",
- 
 "quote",
- 
 "version_check",
- 
]
-
- 
[[package]]

name = "proc-macro-error-attr2"

version = "2.0.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2115,9 +2056,9 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"


[[package]]

name = "radicle"
- 
version = "0.20.0"
+ 
version = "0.21.0"

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

dependencies = [

 "amplify",

 "base64 0.21.7",
@@ -2130,14 +2071,16 @@ dependencies = [
 "git2",

 "indexmap",

 "libc",
- 
 "localtime",

 "log",

 "multibase",

 "nonempty 0.9.0",

 "qcheck",

 "radicle-cob",
+ 
 "radicle-core",

 "radicle-crypto",
- 
 "radicle-git-ext 0.8.1",
+ 
 "radicle-git-ref-format",
+ 
 "radicle-localtime",
+ 
 "radicle-oid",

 "radicle-ssh",

 "serde",

 "serde-untagged",
@@ -2145,20 +2088,21 @@ dependencies = [
 "siphasher",

 "sqlite",

 "tempfile",
- 
 "thiserror 1.0.69",
+ 
 "thiserror 2.0.18",
+ 
 "uds_windows",

 "unicode-normalization",
- 
 "winpipe",

]



[[package]]

name = "radicle-ci-broker"
- 
version = "0.25.0"
+ 
version = "0.26.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "20fc8096dcd08be10711ce225d1c1429b8855180fe830a77e8f36326de4f549c"
+ 
checksum = "6c9210e9172f55b09f6ba4ecacece03e232f9e1b45a1026d09a3f453acd8176a"

dependencies = [

 "clap",

 "duration-str",
- 
 "html-page 0.4.2",
+ 
 "git-ref-format-core",
+ 
 "html-page",

 "libc",

 "nonempty 0.12.0",

 "radicle",
@@ -2183,42 +2127,61 @@ dependencies = [


[[package]]

name = "radicle-cob"
- 
version = "0.17.0"
+ 
version = "0.18.0"

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

dependencies = [

 "fastrand",
+ 
 "git-ref-format-core",

 "git2",

 "log",

 "nonempty 0.9.0",

 "radicle-crypto",

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

 "serde",

 "serde_json",

 "signature 2.2.0",
- 
 "thiserror 1.0.69",
+ 
 "thiserror 2.0.18",
+ 
]
+
+ 
[[package]]
+ 
name = "radicle-core"
+ 
version = "0.1.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "f797194bf12af94f8ce914520bdb54ba9f8c824621f3faa6763101dbd2e1dc79"
+ 
dependencies = [
+ 
 "git2",
+ 
 "multibase",
+ 
 "qcheck",
+ 
 "radicle-crypto",
+ 
 "radicle-oid",
+ 
 "schemars",
+ 
 "serde",
+ 
 "sqlite",
+ 
 "thiserror 2.0.18",

]



[[package]]

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

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

dependencies = [

 "amplify",

 "cyphernet",

 "ec25519",

 "fastrand",
+ 
 "git-ref-format-core",

 "multibase",

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

 "radicle-ssh",

 "serde",

 "signature 2.2.0",

 "sqlite",

 "ssh-key",
- 
 "thiserror 1.0.69",
+ 
 "thiserror 2.0.18",

 "zeroize",

]
@@ -2233,38 +2196,43 @@ dependencies = [


[[package]]

name = "radicle-git-ext"
- 
version = "0.8.1"
+ 
version = "0.12.0"

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

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

 "git2",

 "percent-encoding",
- 
 "radicle-std-ext 0.1.1",
+ 
 "radicle-std-ext",

 "serde",

 "thiserror 1.0.69",

]



[[package]]
- 
name = "radicle-git-ext"
- 
version = "0.11.0"
+ 
name = "radicle-git-metadata"
+ 
version = "0.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "71a5fbca2ee3fc61a6b467e0b85da7c092421afc2538feb0023ad6792d6e39d0"
+ 
checksum = "522d7fa07dfe61981b5d96e9aeb2b7fb2f4a8d5804638e928eaedb33e423eccb"

dependencies = [
- 
 "git-ref-format 0.6.0",
- 
 "git2",
- 
 "percent-encoding",
- 
 "radicle-std-ext 0.2.0",
- 
 "serde",
- 
 "thiserror 1.0.69",
+ 
 "thiserror 2.0.18",
+ 
]
+
+ 
[[package]]
+ 
name = "radicle-git-ref-format"
+ 
version = "0.1.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "7fe7a4a8137c193d15d05a6d1eb9ef79649b52e1f659161df69ebc385bbed55c"
+ 
dependencies = [
+ 
 "git-ref-format-core",

]



[[package]]

name = "radicle-job"
- 
version = "0.4.0"
+ 
version = "0.5.1"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "0985025a171487350c663884a5384694787cb09137160878640290a80e8af52f"
+ 
checksum = "90124dcd988e918e6731fe21260fba1d5954f43617fa0bb75b00d16cc2498766"

dependencies = [
+ 
 "chrono",

 "clap",

 "indexmap",

 "nonempty 0.11.0",
@@ -2279,11 +2247,20 @@ dependencies = [
]



[[package]]
+ 
name = "radicle-localtime"
+ 
version = "0.1.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "c5c36714fd32dc9421f8ed3edf0d1c1a4aa3b5210fddf8eaef40ea90c88fdddd"
+ 
dependencies = [
+ 
 "serde",
+ 
]
+
+ 
[[package]]

name = "radicle-native-ci"

version = "0.12.0"

dependencies = [

 "clap",
- 
 "html-page 0.5.0",
+ 
 "html-page",

 "radicle",

 "radicle-ci-broker",

 "serde",
@@ -2297,6 +2274,16 @@ dependencies = [
]



[[package]]
+ 
name = "radicle-oid"
+ 
version = "0.1.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "d95c486f589d4f5ef7bd8fce56419854d90cc63a8bbcebe021e0a4f4cca75ac9"
+ 
dependencies = [
+ 
 "git2",
+ 
 "serde",
+ 
]
+
+ 
[[package]]

name = "radicle-ssh"

version = "0.10.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2309,21 +2296,15 @@ dependencies = [


[[package]]

name = "radicle-std-ext"
- 
version = "0.1.1"
- 
source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "5310e7a04506b6ce92dc9c47b26bd24c1c680937a3dcd13cd20847f89dbda32a"
-
- 
[[package]]
- 
name = "radicle-std-ext"

version = "0.2.0"

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

checksum = "fb935931bdd2a2966f3b584f3031d9d54ec0713ddbc563a0193d54e62a88ec73"



[[package]]

name = "radicle-surf"
- 
version = "0.26.0"
+ 
version = "0.27.0"

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

dependencies = [

 "anyhow",

 "base64 0.21.7",
@@ -2331,8 +2312,8 @@ dependencies = [
 "git2",

 "log",

 "nonempty 0.9.0",
- 
 "radicle-git-ext 0.11.0",
- 
 "radicle-std-ext 0.2.0",
+ 
 "radicle-git-ext",
+ 
 "radicle-std-ext",

 "serde",

 "tar",

 "thiserror 1.0.69",
@@ -2379,6 +2360,26 @@ dependencies = [
]



[[package]]
+ 
name = "ref-cast"
+ 
version = "1.0.25"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d"
+ 
dependencies = [
+ 
 "ref-cast-impl",
+ 
]
+
+ 
[[package]]
+ 
name = "ref-cast-impl"
+ 
version = "1.0.25"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
+ 
dependencies = [
+ 
 "proc-macro2",
+ 
 "quote",
+ 
 "syn 2.0.117",
+ 
]
+
+ 
[[package]]

name = "regex"

version = "1.12.3"

source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2523,6 +2524,31 @@ dependencies = [
]



[[package]]
+ 
name = "schemars"
+ 
version = "1.2.1"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "a2b42f36aa1cd011945615b92222f6bf73c599a102a300334cd7f8dbeec726cc"
+ 
dependencies = [
+ 
 "dyn-clone",
+ 
 "ref-cast",
+ 
 "schemars_derive",
+ 
 "serde",
+ 
 "serde_json",
+ 
]
+
+ 
[[package]]
+ 
name = "schemars_derive"
+ 
version = "1.2.1"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "7d115b50f4aaeea07e79c1912f645c7513d81715d0420f8bc77a18c6260b307f"
+ 
dependencies = [
+ 
 "proc-macro2",
+ 
 "quote",
+ 
 "serde_derive_internals",
+ 
 "syn 2.0.117",
+ 
]
+
+ 
[[package]]

name = "scoped-tls"

version = "1.0.1"

source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2591,6 +2617,17 @@ dependencies = [
]



[[package]]
+ 
name = "serde_derive_internals"
+ 
version = "0.29.1"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
+ 
dependencies = [
+ 
 "proc-macro2",
+ 
 "quote",
+ 
 "syn 2.0.117",
+ 
]
+
+ 
[[package]]

name = "serde_json"

version = "1.0.149"

source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3218,6 +3255,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"



[[package]]
+ 
name = "uds_windows"
+ 
version = "1.2.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "51b70b87d15e91f553711b40df3048faf27a7a04e01e0ddc0cf9309f0af7c2ca"
+ 
dependencies = [
+ 
 "memoffset",
+ 
 "tempfile",
+ 
 "windows-sys 0.61.2",
+ 
]
+
+ 
[[package]]

name = "unicase"

version = "2.9.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
modified Cargo.toml
@@ -14,8 +14,8 @@ categories = ["development-tools::build-utils"]
[dependencies]

clap = { version = "4.5.32", features = ["derive"] }

html-page = "0.5.0"
- 
radicle = "0.20.0"
- 
radicle-ci-broker = "0.25.0"
+ 
radicle = "0.21.0"
+ 
radicle-ci-broker = "0.26.0"

serde = { version = "1.0.219", features = ["derive"] }

serde_json = "1.0.140"

serde_norway = "0.9.42"
modified src/bin/run_log.rs
@@ -1,9 +1,13 @@
use std::{

    path::Path,
+ 
    str::FromStr,

    time::{Duration, SystemTime},

};
- 
use radicle_ci_broker::msg::{Oid, RepoId, RunId};
+ 
use radicle_ci_broker::{
+ 
    ergo::Oid,
+ 
    msg::{RepoId, RunId},
+ 
};



use radicle_native_ci::{runlog::RunLog, runspec::RunSpec};
@@ -18,10 +22,10 @@ fn main() {
        RepoId::from_urn("rad:z3qg5TKmN83afz2fj9z3fQjU8vaYE").expect("rid"),

        "colossal",

    );
- 
    run_log.commit(Oid::try_from("b788f7ffd38572614457adb1656c0b4575b941dd").expect("commit"));
+ 
    run_log.commit(Oid::from_str("b788f7ffd38572614457adb1656c0b4575b941dd").expect("commit"));

    run_log.branch("xyzzy");

    run_log.patch(
- 
        Oid::try_from("e676fde7bfc7f8d433b50d73a236601d1f63cec3").unwrap(),
+ 
        Oid::from_str("e676fde7bfc7f8d433b50d73a236601d1f63cec3").unwrap(),

        "This be my patch",

    );

    run_log.runspec(RunSpec {
modified src/engine.rs
@@ -3,10 +3,15 @@ use std::path::PathBuf;
use uuid::Uuid;



use radicle::prelude::Profile;
- 
use radicle_ci_broker::msg::{
- 
    helper::{read_request, write_failed, write_succeeded, write_triggered, MessageHelperError},
- 
    EventCommonFields, Oid, Patch, PatchEvent, PushEvent, RepoId, Repository, Request, RunId,
- 
    RunResult,
+ 
use radicle_ci_broker::{
+ 
    ergo::Oid,
+ 
    msg::{
+ 
        helper::{
+ 
            read_request, write_failed, write_succeeded, write_triggered, MessageHelperError,
+ 
        },
+ 
        EventCommonFields, Patch, PatchEvent, PushEvent, RepoId, Repository, Request, RunId,
+ 
        RunResult,
+ 
    },

};



use crate::{
modified src/run.rs
@@ -4,7 +4,10 @@ use std::{
    time::SystemTime,

};
- 
use radicle_ci_broker::msg::{helper::MessageHelperError, Oid, RepoId, Request, RunId};
+ 
use radicle_ci_broker::{
+ 
    ergo::Oid,
+ 
    msg::{helper::MessageHelperError, RepoId, Request, RunId},
+ 
};



use crate::{

    runlog::{RunLog, RunLogError},
modified src/runlog.rs
@@ -6,7 +6,10 @@ use std::{
use html_page::{Element, HtmlPage, Tag};

use time::{macros::format_description, OffsetDateTime};
- 
use radicle_ci_broker::msg::{Oid, RepoId, Request, RunId};
+ 
use radicle_ci_broker::{
+ 
    ergo::Oid,
+ 
    msg::{RepoId, Request, RunId},
+ 
};



use crate::{

    run::RUNSPEC_PATH,
modified tests/integration.rs
@@ -27,10 +27,13 @@ use std::{
    str::FromStr,

};
- 
use radicle::{git::Oid, identity::Did, prelude::RepoId};
- 
use radicle_ci_broker::msg::{
- 
    Author, EventCommonFields, EventType, Patch, PatchAction, PatchEvent, Repository, Request,
- 
    Response, RunId, RunResult, State,
+ 
use radicle::{identity::Did, prelude::RepoId};
+ 
use radicle_ci_broker::{
+ 
    ergo::Oid,
+ 
    msg::{
+ 
        Author, EventCommonFields, EventType, Patch, PatchAction, PatchEvent, Repository, Request,
+ 
        Response, RunId, RunResult, State,
+ 
    },

};

use tempfile::{tempdir, TempDir};
@@ -565,7 +568,7 @@ fn trigger(repo_id: RepoId, commit: Oid) -> Request {
        patch: Some(PatchEvent {

            action: PatchAction::Updated,

            patch: Patch {
- 
                id: Oid::try_from("ff3099ba5de28d954c41d0b5a84316f943794ea4").unwrap(),
+ 
                id: Oid::from_str("ff3099ba5de28d954c41d0b5a84316f943794ea4").unwrap(),

                author: Author {

                    id: Did::decode("did:key:z6MkgEMYod7Hxfy9qCvDv5hYHkZ4ciWmLFgfvm3Wn1b2w2FV")

                        .unwrap(),
@@ -579,7 +582,7 @@ fn trigger(repo_id: RepoId, commit: Oid) -> Request {
                before: commit,

                after: commit,

                commits: vec![commit],
- 
                target: Oid::try_from("244130556b47dbc83323ad8e0c2b53c491e6b925").unwrap(),
+ 
                target: Oid::from_str("244130556b47dbc83323ad8e0c2b53c491e6b925").unwrap(),

                labels: vec![],

                assignees: vec![],

                revisions: vec![],