From 93863462a2617fde13bebe64df80125b9f51168c Mon Sep 17 00:00:00 2001 From: appflowy Date: Wed, 9 Feb 2022 19:17:15 +0800 Subject: [PATCH] fix: pass unit test --- .github/workflows/frontend_dart.yml | 4 ---- .github/workflows/frontend_rust.yml | 6 ------ frontend/Makefile.toml | 2 +- shared-lib/error-code/src/protobuf/model/document | 5 ----- shared-lib/lib-infra/Cargo.toml | 2 +- shared-lib/lib-infra/src/proto_gen/template/mod.rs | 6 +++--- 6 files changed, 5 insertions(+), 20 deletions(-) delete mode 100644 shared-lib/error-code/src/protobuf/model/document diff --git a/.github/workflows/frontend_dart.yml b/.github/workflows/frontend_dart.yml index c2e8b6b2d0..a94e3b6e8a 100644 --- a/.github/workflows/frontend_dart.yml +++ b/.github/workflows/frontend_dart.yml @@ -8,12 +8,8 @@ name: Frontend_Dart on: push: branches: [ main ] - paths: - - 'frontend/app_flowy' pull_request: branches: [ main ] - paths: - - 'frontend/app_flowy' diff --git a/.github/workflows/frontend_rust.yml b/.github/workflows/frontend_rust.yml index c334073507..484c79d037 100644 --- a/.github/workflows/frontend_rust.yml +++ b/.github/workflows/frontend_rust.yml @@ -3,14 +3,8 @@ name: Frontend_Rust on: push: branches: [ main ] - paths: - - 'frontend/rust-lib' - - 'shared-lib' pull_request: branches: [ main ] - paths: - - 'frontend/rust-lib' - - 'shared-lib' env: CARGO_TERM_COLOR: always diff --git a/frontend/Makefile.toml b/frontend/Makefile.toml index 498a86331d..46f7279240 100644 --- a/frontend/Makefile.toml +++ b/frontend/Makefile.toml @@ -158,7 +158,7 @@ script_runner = "@duckscript" condition = { env_set = [ "FLUTTER_FLOWY_SDK_PATH"] } script = [ """ - cd ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/rust-lib/flowy-folder + cd ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/../shared-lib/error-code cargo build -vv """, ] diff --git a/shared-lib/error-code/src/protobuf/model/document b/shared-lib/error-code/src/protobuf/model/document deleted file mode 100644 index e6c7f34086..0000000000 --- a/shared-lib/error-code/src/protobuf/model/document +++ /dev/null @@ -1,5 +0,0 @@ -#![cfg_attr(rustfmt, rustfmt::skip)] -// Auto-generated, do not edit - -mod error_code; -pub use error_code::*; diff --git a/shared-lib/lib-infra/Cargo.toml b/shared-lib/lib-infra/Cargo.toml index e95cf3f5df..6d3c5a2f1d 100644 --- a/shared-lib/lib-infra/Cargo.toml +++ b/shared-lib/lib-infra/Cargo.toml @@ -27,7 +27,7 @@ syn = { version = "1.0.60", features = ["extra-traits", "parsing", "derive", "fu fancy-regex = { version = "0.5.0", optional = true } lazy_static = { version = "1.4.0", optional = true } tera = { version = "1.5.0", optional = true} -itertools = {versino = "0.10", optional = true} +itertools = { version = "0.10", optional = true } phf = { version = "0.8.0", features = ["macros"], optional = true } console = {version = "0.14.0", optional = true} diff --git a/shared-lib/lib-infra/src/proto_gen/template/mod.rs b/shared-lib/lib-infra/src/proto_gen/template/mod.rs index e610bc373b..a2ef4da1d5 100644 --- a/shared-lib/lib-infra/src/proto_gen/template/mod.rs +++ b/shared-lib/lib-infra/src/proto_gen/template/mod.rs @@ -8,13 +8,13 @@ use std::io::Read; use tera::Tera; pub fn get_tera(directory: &str) -> Tera { - let mut root = format!("{}/../", file!()); + let mut root = format!("{}/src/proto_gen/template/", env!("CARGO_MANIFEST_DIR")); root.push_str(directory); - let root_absolute_path = match std::fs::canonicalize(root) { + let root_absolute_path = match std::fs::canonicalize(&root) { Ok(p) => p.as_path().display().to_string(), Err(e) => { - panic!("canonicalize {} failed {:?}", root, e); + panic!("❌ Canonicalize file path {} failed {:?}", root, e); } };