Radish alpha
r
radicle-ci-broker
Radicle CI broker
Radicle
Git (anonymous pull)
Log in to clone via SSH
Commits ›
feat(src/msg.rs): set a uuid as the RunId by default
Lars Wirzenius committed 2 years ago
commit b53cf99e22d69070d4d86581d87cf68ed5167dbd
parent cd3c81222a2ffc78e0c006a9b68c1805622826b7
3 files changed +45 -24
modified Cargo.lock
@@ -672,9 +672,9 @@ dependencies = [


[[package]]

name = "indexmap"
- 
version = "2.1.0"
+ 
version = "2.2.2"

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

dependencies = [

 "equivalent",

 "hashbrown",
@@ -736,9 +736,9 @@ dependencies = [


[[package]]

name = "libc"
- 
version = "0.2.152"
+ 
version = "0.2.153"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
+ 
checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"



[[package]]

name = "libgit2-sys"
@@ -760,9 +760,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"


[[package]]

name = "libz-sys"
- 
version = "1.1.14"
+ 
version = "1.1.15"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "295c17e837573c8c821dbaeb3cceb3d745ad082f7572191409e69cbc1b3fd050"
+ 
checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6"

dependencies = [

 "cc",

 "libc",
@@ -1083,7 +1083,7 @@ dependencies = [
[[package]]

name = "radicle"

version = "0.2.0"
- 
source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#49584f4e732fb0039d2089f3c39fd56fc34a2ee3"
+ 
source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#e12bff0871a57116f057fd1a93f7ddede8c574bc"

dependencies = [

 "amplify",

 "base64 0.21.7",
@@ -1125,12 +1125,13 @@ dependencies = [
 "serde_yaml",

 "tempfile",

 "thiserror",
+ 
 "uuid",

]



[[package]]

name = "radicle-cob"

version = "0.2.0"
- 
source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#49584f4e732fb0039d2089f3c39fd56fc34a2ee3"
+ 
source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#e12bff0871a57116f057fd1a93f7ddede8c574bc"

dependencies = [

 "fastrand",

 "git2",
@@ -1148,7 +1149,7 @@ dependencies = [
[[package]]

name = "radicle-crypto"

version = "0.2.0"
- 
source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#49584f4e732fb0039d2089f3c39fd56fc34a2ee3"
+ 
source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#e12bff0871a57116f057fd1a93f7ddede8c574bc"

dependencies = [

 "amplify",

 "cyphernet",
@@ -1168,7 +1169,7 @@ dependencies = [
[[package]]

name = "radicle-dag"

version = "0.2.0"
- 
source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#49584f4e732fb0039d2089f3c39fd56fc34a2ee3"
+ 
source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#e12bff0871a57116f057fd1a93f7ddede8c574bc"

dependencies = [

 "fastrand",

]
@@ -1190,7 +1191,7 @@ dependencies = [
[[package]]

name = "radicle-ssh"

version = "0.2.0"
- 
source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#49584f4e732fb0039d2089f3c39fd56fc34a2ee3"
+ 
source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#e12bff0871a57116f057fd1a93f7ddede8c574bc"

dependencies = [

 "byteorder",

 "log",
@@ -1275,9 +1276,9 @@ dependencies = [


[[package]]

name = "regex-automata"
- 
version = "0.4.4"
+ 
version = "0.4.5"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a"
+ 
checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"

dependencies = [

 "aho-corasick",

 "memchr",
@@ -1323,9 +1324,9 @@ dependencies = [


[[package]]

name = "rustix"
- 
version = "0.38.30"
+ 
version = "0.38.31"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca"
+ 
checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"

dependencies = [

 "bitflags 2.4.2",

 "errno",
@@ -1356,18 +1357,18 @@ dependencies = [


[[package]]

name = "serde"
- 
version = "1.0.195"
+ 
version = "1.0.196"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02"
+ 
checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"

dependencies = [

 "serde_derive",

]



[[package]]

name = "serde_derive"
- 
version = "1.0.195"
+ 
version = "1.0.196"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c"
+ 
checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"

dependencies = [

 "proc-macro2",

 "quote",
@@ -1376,9 +1377,9 @@ dependencies = [


[[package]]

name = "serde_json"
- 
version = "1.0.111"
+ 
version = "1.0.113"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4"
+ 
checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"

dependencies = [

 "indexmap",

 "itoa",
@@ -1388,9 +1389,9 @@ dependencies = [


[[package]]

name = "serde_yaml"
- 
version = "0.9.30"
+ 
version = "0.9.31"

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

dependencies = [

 "indexmap",

 "itoa",
@@ -1704,6 +1705,15 @@ dependencies = [
]



[[package]]
+ 
name = "uuid"
+ 
version = "1.7.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
+ 
dependencies = [
+ 
 "getrandom",
+ 
]
+
+ 
[[package]]

name = "vcpkg"

version = "0.2.15"

source = "registry+https://github.com/rust-lang/crates.io-index"
modified Cargo.toml
@@ -12,10 +12,12 @@ serde_json = "1.0.108"
serde_yaml = "0.9.27"

thiserror = "1.0.50"

radicle-surf = { version = "0.18.0", default-features = false, features = ["serde"] }
+ 
uuid = { version = "1.7.0", features = ["v4"] }



[dependencies.radicle]

git = "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git"

branch = "master"
+ 
#path = "../heartwood/radicle"

features = ["default", "test"]



[dev-dependencies]
modified src/msg.rs
@@ -24,6 +24,7 @@ use radicle::storage::git::paths;
use radicle::storage::{ReadRepository, ReadStorage};

use radicle::{patch, Profile};

use serde::{Deserialize, Serialize};
+ 
use uuid::Uuid;



use crate::event::{is_patch_update, BrokerEvent};
@@ -36,11 +37,19 @@ use crate::event::{is_patch_update, BrokerEvent};
/// let id = RunId::from("abracadabra");

/// println!("{}", id.to_string());

/// ```
- 
#[derive(Debug, Clone, Serialize, Deserialize)]
+ 
#[derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize)]

pub struct RunId {

    id: String,

}
+ 
impl Default for RunId {
+ 
    fn default() -> Self {
+ 
        Self {
+ 
            id: Uuid::new_v4().to_string(),
+ 
        }
+ 
    }
+ 
}
+ 


impl From<&str> for RunId {

    fn from(id: &str) -> Self {

        Self { id: id.into() }