Skip to content

Commit

Permalink
bump version to 0.1.4 (#17)
Browse files Browse the repository at this point in the history
  • Loading branch information
fslongjin authored Nov 8, 2023
1 parent d3b91fd commit bc00399
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "dadk"
authors = ["longjin <[email protected]>", "chikejian <[email protected]>"]
version = "0.1.3"
version = "0.1.4"
edition = "2021"
description = "DragonOS Application Development Kit\nDragonOS应用开发工具"
license = "GPL-2.0-only"
Expand All @@ -23,5 +23,5 @@ regex = "1.9.1"
reqwest = { version = "0.11", features = ["blocking", "json"] }
serde = { version = "1.0.160", features = ["serde_derive"] }
serde_json = "1.0.96"
simple_logger = "4.1.0"
simple_logger = { version = "4.1.0", features = ["stderr"] }
zip = "0.6"
11 changes: 6 additions & 5 deletions src/executor/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,12 @@ impl Executor {
.add(EnvVar::new(tv.key().to_string(), tv.value().to_string()));
}

// 添加`DADK_CURRENT_BUILD_DIR`环境变量,便于构建脚本把构建结果拷贝到这里
self.local_envs.add(EnvVar::new(
"DADK_CURRENT_BUILD_DIR".to_string(),
self.build_dir.path.to_str().unwrap().to_string(),
));

return Ok(());
}

Expand Down Expand Up @@ -548,11 +554,6 @@ pub fn prepare_env(sched_entities: &SchedEntities) -> Result<(), ExecutorError>
build_dir_key,
build_dir.to_str().unwrap().to_string(),
));
// 添加`DADK_CURRENT_BUILD_DIR`环境变量,便于构建脚本把构建结果拷贝到这里
env_list.add(EnvVar::new(
"DADK_CURRENT_BUILD_DIR".to_string(),
build_dir.to_str().unwrap().to_string(),
));

// 如果需要源码缓存目录,则导出
if CacheDir::need_source_cache(entity) {
Expand Down
1 change: 0 additions & 1 deletion src/scheduler/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,6 @@ impl Scheduler {
mut count: usize,
r: &Vec<Arc<SchedEntity>>,
) {
log::warn!("daemon");
let mut guard = TASK_DEQUE.lock().unwrap();
// 初始化0入度的任务实体
let mut zero_entity: Vec<Arc<SchedEntity>> = Vec::new();
Expand Down

0 comments on commit bc00399

Please sign in to comment.