summaryrefslogtreecommitdiffstats
path: root/crates
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2024-04-04 00:47:55 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2024-04-04 01:16:14 +0200
commit515faa6bf275ac1871003778e640824a5e07bf33 (patch)
tree6671ced216f4ebfe11db1529da1d6089336381df /crates
parent239a830981b6641a56b44e192b7ac60e38942a3f (diff)
downloadrebel-515faa6bf275ac1871003778e640824a5e07bf33.tar
rebel-515faa6bf275ac1871003778e640824a5e07bf33.zip
driver: recipe: do not set version from filename
Diffstat (limited to 'crates')
-rw-r--r--crates/driver/src/recipe.rs12
1 files changed, 2 insertions, 10 deletions
diff --git a/crates/driver/src/recipe.rs b/crates/driver/src/recipe.rs
index 474096b..ec1c116 100644
--- a/crates/driver/src/recipe.rs
+++ b/crates/driver/src/recipe.rs
@@ -64,13 +64,8 @@ pub fn read_recipes<P: AsRef<Path>>(path: P) -> Result<HashMap<TaskID, Vec<TaskD
continue;
}
- let stem: &str = match path.file_stem().map(|n| n.to_str()) {
- Some(Some(v)) => v,
- _ => continue,
- };
- let (basename, version) = match stem.split_once('@') {
- Some((basename, version)) => (basename, Some(version)),
- None => (stem, None),
+ let Some(Some(basename)) = path.file_stem().map(|n| n.to_str()) else {
+ continue;
};
let recipe = CURRENT_RECIPE.set(basename, || read_recipe(path))?;
@@ -79,9 +74,6 @@ pub fn read_recipes<P: AsRef<Path>>(path: P) -> Result<HashMap<TaskID, Vec<TaskD
if meta.name.is_empty() {
meta.name = basename.to_string();
}
- if meta.version.is_none() {
- meta.version = version.map(|v| v.to_string());
- }
for (label, mut task) in recipe.tasks {
let task_id = TaskID {