Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: fix dart pb

Browse Source
This commit is contained in:
appflowy
2022-02-09 01:14:54 +08:00
parent 10187ce049
commit 837666d36d
4 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/ci.yaml vendored
View File

@ -32,7 +32,6 @@ jobs:
run: | run: |
cargo install --force cargo-make cargo install --force cargo-make
cargo install --force duckscript_cli cargo install --force duckscript_cli
brew install protobuf
cargo make flowy_dev cargo make flowy_dev
- name: Build - name: Build
working-directory: frontend working-directory: frontend

2
frontend/scripts/makefile/desktop.toml
View File

@ -5,7 +5,7 @@
# cargo make --profile production-windows-x86 flowy-sdk-dev # cargo make --profile production-windows-x86 flowy-sdk-dev
[tasks.env_check] [tasks.env_check]
dependencies = ["echo_env", "install-pb-tool-if-need"] dependencies = ["echo_env", "install_protobuf"]
condition = { env_set = [ "BUILD_FLAG", "RUST_COMPILE_TARGET", "CRATE_TYPE", "TARGET_OS"], channels = ["stable"] } condition = { env_set = [ "BUILD_FLAG", "RUST_COMPILE_TARGET", "CRATE_TYPE", "TARGET_OS"], channels = ["stable"] }
[tasks.flowy-sdk-dev] [tasks.flowy-sdk-dev]

28
frontend/scripts/makefile/protobuf.toml
View File

@ -2,16 +2,14 @@
[tasks.pb] [tasks.pb]
dependencies = ["check_protoc_cmd", "gen_pb_file"] dependencies = ["check_protoc_cmd", "gen_pb_file"]
[tasks.install-pb-tool-if-need] [tasks.install_protobuf]
condition_script = [ condition_script = [
""" """
if [ ! "$(command -v dart)" ]; then if [ ! "$(command -v protoc)" ]; then
echo Please make sure flutter/dart is properly installed and in PATH env var exit 0
exit 1
fi fi
if [ ! "$(command -v protoc-gen-dart)" ]; then if [ ! "$(command -v protoc-gen-dart)" ]; then
# not install
exit 0 exit 0
fi fi
@ -19,19 +17,27 @@ condition_script = [
exit 1 exit 1
""", """,
] ]
run_task = { name = ["install_protobuf"] } run_task = { name = ["install_protobuf_compiler"] }
[tasks.install_protobuf] [tasks.install_protobuf_compiler]
script = """ script = """
brew install protobuf
echo "Install protoc_plugin (Dart)" echo "Install protoc_plugin (Dart)"
dart pub global activate protoc_plugin dart pub global activate protoc_plugin
export PATH="$HOME/.pub-cache/bin:$PATH"
cargo install --version 2.22.1 protobuf-codegen
""" """
script_runner = "@shell" script_runner = "@shell"
[tasks.install_protobuf.windows] [tasks.install_protobuf_compiler.linux]
script = """
sudo apt-get install protobuf-compiler
echo "Install protoc_plugin (Dart)"
dart pub global activate protoc_plugin
"""
script_runner = "@shell"
[tasks.install_protobuf_compiler.windows]
script = """ script = """
ret = which dart ret = which dart
if is_empty ${ret} if is_empty ${ret}

7
shared-lib/lib-infra/src/pb_gen.rs
View File

@ -4,7 +4,6 @@ use std::fs::File;
use std::io::Write; use std::io::Write;
use walkdir::WalkDir; use walkdir::WalkDir;
#[allow(dead_code)]
pub fn gen(name: &str, root: &str) { pub fn gen(name: &str, root: &str) {
let mut paths = vec![]; let mut paths = vec![];
let mut file_names = vec![]; let mut file_names = vec![];
@ -21,8 +20,8 @@ pub fn gen(name: &str, root: &str) {
} }
} }
// #[cfg(feature = "dart")] #[cfg(feature = "dart")]
// gen_pb_for_dart(name, root, &paths, &file_names); gen_pb_for_dart(name, root, &paths, &file_names);
protoc_rust::Codegen::new() protoc_rust::Codegen::new()
.out_dir("./src/protobuf/model") .out_dir("./src/protobuf/model")
@ -50,7 +49,7 @@ fn gen_pb_for_dart(name: &str, root: &str, paths: &Vec<String>, file_names: &Vec
} }
.is_err() .is_err()
{ {
panic!("Run flutter protoc fail") panic!("Generate pb file failed with: {}", path)
}; };
}); });