Radish alpha
r
radicle-ci-broker
rad:zwTxygwuz5LDGBq255RA2CbNGrz8
Radicle CI broker
Radicle
Git
Patches › b8d5d0cb
chore: update dependencies on radicle, radicle-crypto, fix problem
Merged liw opened 11 months ago

Drop now-unnecessary import from src/test.rs.

Signed-off-by: Lars Wirzenius liw@liw.fi

feat: log lines adapter writes to its stdout

Signed-off-by: Lars Wirzenius liw@liw.fi

Activity Changes +33 -10
5 files changed +33 -10 7f8ddca5 → 5f8b73e9
modified Cargo.lock
@@ -323,6 +323,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"



[[package]]
+ 
name = "bytesize"
+ 
version = "2.0.1"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "a3c8f83209414aacf0eeae3cf730b18d6981697fba62f200fcfb92b9f082acba"
+ 
dependencies = [
+ 
 "serde",
+ 
]
+
+ 
[[package]]

name = "cbc"

version = "0.1.2"

source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -656,7 +665,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18e4fdb82bd54a12e42fb58a800dcae6b9e13982238ce2296dc3570b92148e1f"

dependencies = [

 "data-encoding",
- 
 "syn 1.0.109",
+ 
 "syn 2.0.100",

]



[[package]]
@@ -1933,12 +1942,13 @@ checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"


[[package]]

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

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

dependencies = [

 "amplify",

 "base64 0.21.7",
+ 
 "bytesize",

 "crossbeam-channel",

 "cyphernet",

 "fastrand",
@@ -2000,9 +2010,9 @@ dependencies = [


[[package]]

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

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

dependencies = [

 "fastrand",

 "git2",
@@ -2014,14 +2024,15 @@ dependencies = [
 "radicle-git-ext",

 "serde",

 "serde_json",
+ 
 "signature 2.2.0",

 "thiserror 1.0.69",

]



[[package]]

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

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

dependencies = [

 "amplify",

 "cyphernet",
@@ -2032,6 +2043,7 @@ dependencies = [
 "radicle-git-ext",

 "radicle-ssh",

 "serde",
+ 
 "signature 2.2.0",

 "sqlite",

 "ssh-key",

 "thiserror 1.0.69",
modified Cargo.toml
@@ -16,7 +16,7 @@ clap = { version = "4.5.11", features = ["derive", "wrap_help"] }
duration-str = "0.12.0"

html-page = "0.4.0"

nonempty = "0.11.0"
- 
radicle-crypto = "0.11.0"
+ 
radicle-crypto = "0.12.0"

radicle-git-ext = "0.8.0"

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

regex = "1.10.5"
@@ -36,7 +36,7 @@ uuid = { version = "1.10.0", features = ["v4"] }
valuable = { version = "0.1.0", features = ["derive"] }



[dependencies.radicle]
- 
version = "0.14.0"
+ 
version = "0.15.0"

features = ["default", "test"]



[dev-dependencies]
modified src/adapter.rs
@@ -221,6 +221,7 @@ impl Adapter {
        }



        if let Some(line) = stdout.line() {
+ 
            logger::adapter_stdout_line(&line);

            let resp = Response::from_str(&line).map_err(AdapterError::ParseResponse)?;

            run_notification.notify()?;

            match resp {
@@ -238,6 +239,7 @@ impl Adapter {
        }



        if let Some(line) = stdout.line() {
+ 
            logger::adapter_stdout_line(&line);

            let resp = Response::from_str(&line).map_err(AdapterError::ParseResponse)?;

            logger::adapter_too_many_responses();

            return Err(AdapterError::TooMany(resp));
modified src/logger.rs
@@ -113,6 +113,7 @@ enum Id {
    AdapterNoFirstMessage,

    AdapterNoSecondMessage,

    AdapterStderrLine,
+ 
    AdapterStdoutLine,

    AdapterTooManyMessages,



    BrokerDatabase,
@@ -740,6 +741,15 @@ pub fn patch_cob_lookup(repo_id: &RepoId, patch_id: &PatchId) {
    );

}
+ 
pub fn adapter_stdout_line(line: &str) {
+ 
    trace!(
+ 
        msg_id = ?Id::AdapterStdoutLine,
+ 
        kind = %Kind::AdapterMessage,
+ 
        ?line,
+ 
        "Action: shutdown"
+ 
    );
+ 
}
+ 


pub fn adapter_no_first_response() {

    error!(

        msg_id = ?Id::AdapterNoFirstMessage,
modified src/test.rs
@@ -9,7 +9,6 @@ use crate::ci_event::{CiEvent, CiEventV1};
use crate::msg::{Request, RequestBuilder};

use radicle::crypto::ssh::Keystore;

use radicle::crypto::test::signer::MockSigner;
- 
use radicle::crypto::Signer;

use radicle::git::RefString;

use radicle::profile::{Config, Home};

use radicle::storage::ReadRepository;