summaryrefslogtreecommitdiffstats
path: root/src/executor.rs
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2021-09-17 22:27:18 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2021-09-17 22:27:18 +0200
commitb432d778bbf10fd103856186197ce4a8908edfd5 (patch)
tree41fa45e82f14a966a66dd6ccd93e8123410181f8 /src/executor.rs
parent1d340bbd261da57ca603c05e5b712c936efcc902 (diff)
downloadrebel-b432d778bbf10fd103856186197ce4a8908edfd5.tar
rebel-b432d778bbf10fd103856186197ce4a8908edfd5.zip
executor: include runtime dependencies
Diffstat (limited to 'src/executor.rs')
-rw-r--r--src/executor.rs8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/executor.rs b/src/executor.rs
index b663713..94c6482 100644
--- a/src/executor.rs
+++ b/src/executor.rs
@@ -3,7 +3,7 @@ use std::collections::{HashMap, HashSet};
use serde::{Deserialize, Serialize};
use crate::{
- paths, runner,
+ paths, resolve, runner,
types::*,
util::{cjson, error::*, fs},
};
@@ -133,13 +133,15 @@ impl<'a> Executor<'a> {
sha256: *sha256,
})
.chain(
- task.build_depends
+ resolve::runtime_depends(self.tasks, &task.build_depends)
+ .expect("invalid runtime depends of build_depends")
.iter()
.filter_map(|dep| self.tasks_done[&dep.task].output.get(&dep.output))
.map(|&output| Dependency::BuildTask { output }),
)
.chain(
- task.target_depends
+ resolve::runtime_depends(self.tasks, &task.target_depends)
+ .expect("invalid runtime depends of target_depends")
.iter()
.filter_map(|dep| self.tasks_done[&dep.task].output.get(&dep.output))
.map(|&output| Dependency::TargetTask { output }),