Radish alpha
r
rad:z3qg5TKmN83afz2fj9z3fQjU8vaYE
Radicle CI adapter for native CI
Radicle
Git
pass in RunLog, not filename for it
Lars Wirzenius committed 2 years ago
commit 9225ef0d3119967a042ac147243739ea130f0c19
parent 8be0bbd
1 file changed +4 -6
modified src/bin/radicle-native-ci.rs
@@ -243,7 +243,7 @@ struct RunnerBuilder<'a> {
    commit: Option<Oid>,
    src: Option<PathBuf>,
    log: Option<&'a mut LogFile>,
-
    run_log: Option<PathBuf>,
+
    run_log: Option<RunLog>,
    timeout: Option<usize>,
    builder: Option<&'a mut RunInfoBuilder>,
}
@@ -279,8 +279,8 @@ impl<'a> RunnerBuilder<'a> {
        self
    }

-
    fn run_log(mut self, path: &Path) -> Self {
-
        self.run_log = Some(path.into());
+
    fn run_log(mut self, run_log: RunLog) -> Self {
+
        self.run_log = Some(run_log);
        self
    }

@@ -295,8 +295,6 @@ impl<'a> RunnerBuilder<'a> {
    }

    fn build(self) -> Result<Runner<'a>, NativeError> {
-
        let run_log = self.run_log.ok_or(NativeError::Unset("run_log"))?;
-
        let run_log = RunLog::new(&run_log);
        Ok(Runner {
            run_id: self.run_id.ok_or(NativeError::Unset("run_id"))?,
            storage: self.storage.ok_or(NativeError::Unset("storage"))?,
@@ -304,7 +302,7 @@ impl<'a> RunnerBuilder<'a> {
            commit: self.commit.ok_or(NativeError::Unset("commit"))?,
            src: self.src.ok_or(NativeError::Unset("src"))?,
            log: self.log.ok_or(NativeError::Unset("log"))?,
-
            run_log,
+
            run_log: self.run_log.ok_or(NativeError::Unset("run_log"))?,
            timeout: self.timeout,
            builder: self.builder.ok_or(NativeError::Unset("builder"))?,
        })