From 149c2a2725cc20c497a3ffa6a67c4b831e148d39 Mon Sep 17 00:00:00 2001 From: "Nathan.fooo" <86001920+appflowy@users.noreply.github.com> Date: Sat, 26 Nov 2022 22:18:39 +0800 Subject: [PATCH] Ci/build scripts (#1487) * chore: rename flowy_dev name * chore: rename tasks Co-authored-by: nathan --- .github/workflows/ci.yaml | 4 ++-- .github/workflows/dart_lint.yml | 4 ++-- .github/workflows/dart_test.yml | 2 +- .github/workflows/release.yml | 6 ++--- .github/workflows/rust_lint.yml | 4 ++-- frontend/.vscode/tasks.json | 2 +- frontend/scripts/build_sdk.cmd | 2 +- frontend/scripts/build_sdk.sh | 6 ++--- frontend/scripts/docker-buildfiles/Dockerfile | 2 +- .../scripts/install_dev_env/install_linux.sh | 2 +- .../scripts/install_dev_env/install_macos.sh | 2 +- .../install_dev_env/install_windows.sh | 2 +- frontend/scripts/makefile/desktop.toml | 22 +++++++++---------- frontend/scripts/makefile/env.toml | 2 +- frontend/scripts/makefile/flutter.toml | 12 +++++----- 15 files changed, 37 insertions(+), 37 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index dca1ecb2ec..174c7434a7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -78,10 +78,10 @@ jobs: cargo install cargo-make cargo install duckscript_cli - - name: Cargo make flowy_dev + - name: Cargo make appflowy-deps-tools working-directory: frontend run: | - cargo make flowy_dev + cargo make appflowy-deps-tools - name: Config Flutter run: | diff --git a/.github/workflows/dart_lint.yml b/.github/workflows/dart_lint.yml index 678677e3d4..60f5408a87 100644 --- a/.github/workflows/dart_lint.yml +++ b/.github/workflows/dart_lint.yml @@ -64,7 +64,7 @@ jobs: - name: Cargo make flowy dev working-directory: frontend run: | - cargo make flowy_dev + cargo make appflowy-deps-tools - name: Flutter Deps run: flutter packages pub get @@ -73,7 +73,7 @@ jobs: - name: Build FlowySDK working-directory: frontend run: | - cargo make --profile development-linux-x86_64 flowy-sdk-dev + cargo make --profile development-linux-x86_64 appflowy-sdk-dev - name: Flutter Code Generation working-directory: frontend/app_flowy diff --git a/.github/workflows/dart_test.yml b/.github/workflows/dart_test.yml index 39a938628e..39b3fb6b89 100644 --- a/.github/workflows/dart_test.yml +++ b/.github/workflows/dart_test.yml @@ -54,7 +54,7 @@ jobs: working-directory: frontend run: | cargo install cargo-make - cargo make flowy_dev + cargo make appflowy-deps-tools - name: Flutter Deps working-directory: frontend/app_flowy diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 03f2bb13db..545963de3f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -63,7 +63,7 @@ jobs: source $HOME/.cargo/env cargo install --force cargo-make cargo install --force duckscript_cli - cargo make flowy_dev + cargo make appflowy-deps-tools - name: Build Linux app working-directory: frontend @@ -161,7 +161,7 @@ jobs: source $HOME/.cargo/env cargo install --force cargo-make cargo install --force duckscript_cli - cargo make flowy_dev + cargo make appflowy-deps-tools - name: Build macOS app for x86_64 working-directory: frontend @@ -234,7 +234,7 @@ jobs: vcpkg integrate install cargo install --force cargo-make cargo install --force duckscript_cli - cargo make flowy_dev + cargo make appflowy-deps-tools - name: Build Windows app working-directory: frontend diff --git a/.github/workflows/rust_lint.yml b/.github/workflows/rust_lint.yml index 4ea8ba40a2..71572ea9b8 100644 --- a/.github/workflows/rust_lint.yml +++ b/.github/workflows/rust_lint.yml @@ -39,12 +39,12 @@ jobs: working-directory: frontend run: | cargo install cargo-make - cargo make flowy_dev + cargo make appflowy-deps-tools - name: Build FlowySDK working-directory: frontend run: | - cargo make --profile development-linux-x86_64 flowy-sdk-dev + cargo make --profile development-linux-x86_64 appflowy-sdk-dev - run: rustup component add rustfmt working-directory: frontend/rust-lib diff --git a/frontend/.vscode/tasks.json b/frontend/.vscode/tasks.json index 30fc1e134d..ecb7471ddf 100644 --- a/frontend/.vscode/tasks.json +++ b/frontend/.vscode/tasks.json @@ -48,7 +48,7 @@ { "label": "AF: build_flowy_sdk_for_android", "type": "shell", - "command": "cargo make --profile development-android flowy-sdk-dev-android", + "command": "cargo make --profile development-android appflowy-sdk-dev-android", "group": "build", "options": { "cwd": "${workspaceFolder}" diff --git a/frontend/scripts/build_sdk.cmd b/frontend/scripts/build_sdk.cmd index 5ddcbd82ab..b13e2aa258 100644 --- a/frontend/scripts/build_sdk.cmd +++ b/frontend/scripts/build_sdk.cmd @@ -1,3 +1,3 @@ echo "Start building rust sdk" rustup show -cargo make --profile development-windows-x86 flowy-sdk-dev \ No newline at end of file +cargo make --profile development-windows-x86 appflowy-sdk-dev \ No newline at end of file diff --git a/frontend/scripts/build_sdk.sh b/frontend/scripts/build_sdk.sh index cfe6bdb316..f9ea3e1a58 100755 --- a/frontend/scripts/build_sdk.sh +++ b/frontend/scripts/build_sdk.sh @@ -17,15 +17,15 @@ rustup show case "$FLOWY_DEV_ENV" in Linux) - cargo make --profile "development-linux-$(uname -m)" flowy-sdk-dev + cargo make --profile "development-linux-$(uname -m)" appflowy-sdk-dev ;; macOS) - cargo make --profile "development-mac-$(uname -m)" flowy-sdk-dev + cargo make --profile "development-mac-$(uname -m)" appflowy-sdk-dev ;; Windows) - cargo make --profile development-windows flowy-sdk-dev + cargo make --profile development-windows appflowy-sdk-dev ;; *) diff --git a/frontend/scripts/docker-buildfiles/Dockerfile b/frontend/scripts/docker-buildfiles/Dockerfile index 4c1ec1e3ea..26ad3cd6b4 100644 --- a/frontend/scripts/docker-buildfiles/Dockerfile +++ b/frontend/scripts/docker-buildfiles/Dockerfile @@ -33,7 +33,7 @@ cd appflowy/frontend && \ source $HOME/.cargo/env && \ cargo install --force cargo-make && \ cargo install --force duckscript_cli && \ -cargo make flowy_dev && \ +cargo make appflowy-deps-tools && \ cargo make -p production-linux-x86_64 appflowy-linux CMD ["/home/makepkg/appflowy/frontend/app_flowy/build/linux/x64/release/bundle/app_flowy"] diff --git a/frontend/scripts/install_dev_env/install_linux.sh b/frontend/scripts/install_dev_env/install_linux.sh index 94a8234a26..8e6b8698cb 100755 --- a/frontend/scripts/install_dev_env/install_linux.sh +++ b/frontend/scripts/install_dev_env/install_linux.sh @@ -73,4 +73,4 @@ cargo install --force duckscript_cli # Check prerequisites printMessage "Checking prerequisites." -cargo make flowy_dev +cargo make appflowy-deps-tools diff --git a/frontend/scripts/install_dev_env/install_macos.sh b/frontend/scripts/install_dev_env/install_macos.sh index 5c1ed9b49a..4aa2c96bc2 100755 --- a/frontend/scripts/install_dev_env/install_macos.sh +++ b/frontend/scripts/install_dev_env/install_macos.sh @@ -72,4 +72,4 @@ cargo install --force duckscript_cli # Check prerequisites printMessage "Checking prerequisites." -cargo make flowy_dev +cargo make appflowy-deps-tools diff --git a/frontend/scripts/install_dev_env/install_windows.sh b/frontend/scripts/install_dev_env/install_windows.sh index bbba4cf2d5..ca95a57bbd 100644 --- a/frontend/scripts/install_dev_env/install_windows.sh +++ b/frontend/scripts/install_dev_env/install_windows.sh @@ -92,4 +92,4 @@ vcpkg integrate install # Check prerequisites printMessage "Checking prerequisites." -PATH="$PATH;$LOCALAPPDATA\Pub\Cache\bin" bash -c '$USERPROFILE/.cargo/bin/cargo make flowy_dev' +PATH="$PATH;$LOCALAPPDATA\Pub\Cache\bin" bash -c '$USERPROFILE/.cargo/bin/cargo make appflowy-deps-tools' diff --git a/frontend/scripts/makefile/desktop.toml b/frontend/scripts/makefile/desktop.toml index f6c5cf3f80..89c23b96b3 100644 --- a/frontend/scripts/makefile/desktop.toml +++ b/frontend/scripts/makefile/desktop.toml @@ -1,34 +1,34 @@ # cargo make --profile production task # Run the task with profile, e.g. -# cargo make --profile development-mac flowy-sdk-dev -# cargo make --profile production-windows-x86 flowy-sdk-dev +# cargo make --profile development-mac appflowy-sdk-dev +# cargo make --profile production-windows-x86 appflowy-sdk-dev [tasks.env_check] dependencies = ["echo_env", "install_protobuf"] condition = { env_set = [ "BUILD_FLAG", "RUST_COMPILE_TARGET", "CRATE_TYPE", "TARGET_OS"], channels = ["stable"] } -[tasks.flowy-sdk-dev] -mac_alias = "flowy-sdk-dev-macos" -windows_alias = "flowy-sdk-dev-windows" -linux_alias = "flowy-sdk-dev-linux" +[tasks.appflowy-sdk-dev] +mac_alias = "appflowy-sdk-dev-macos" +windows_alias = "appflowy-sdk-dev-windows" +linux_alias = "appflowy-sdk-dev-linux" -[tasks.flowy-sdk-dev-android] +[tasks.appflowy-sdk-dev-android] category = "Build" dependencies = ["env_check"] run_task = { name = ["setup-crate-type","sdk-build-android", "restore-crate-type"] } -[tasks.flowy-sdk-dev-macos] +[tasks.appflowy-sdk-dev-macos] category = "Build" dependencies = ["env_check"] run_task = { name = ["setup-crate-type","sdk-build", "post-desktop", "restore-crate-type"] } -[tasks.flowy-sdk-dev-windows] +[tasks.appflowy-sdk-dev-windows] category = "Build" dependencies = ["env_check"] run_task = { name = ["setup-crate-type","sdk-build", "post-desktop", "restore-crate-type"] } -[tasks.flowy-sdk-dev-linux] +[tasks.appflowy-sdk-dev-linux] category = "Build" dependencies = ["env_check"] run_task = { name = ["setup-crate-type","sdk-build", "post-desktop", "restore-crate-type"] } @@ -86,7 +86,7 @@ script = [ script_runner = "@duckscript" # -[tasks.flowy-sdk-release] +[tasks.appflowy-sdk-release] description = "Build flowy sdk in release mode" category = "Build" dependencies = ["env_check"] diff --git a/frontend/scripts/makefile/env.toml b/frontend/scripts/makefile/env.toml index 7eb1376ab8..3ca9d7697c 100644 --- a/frontend/scripts/makefile/env.toml +++ b/frontend/scripts/makefile/env.toml @@ -1,4 +1,4 @@ -[tasks.flowy_dev] +[tasks.appflowy-deps-tools] run_task = { name = ["install_prerequests","install_diesel", "install_protobuf"] } [tasks.install_windows_deps.windows] diff --git a/frontend/scripts/makefile/flutter.toml b/frontend/scripts/makefile/flutter.toml index 2a93a02791..d2bede3c6d 100644 --- a/frontend/scripts/makefile/flutter.toml +++ b/frontend/scripts/makefile/flutter.toml @@ -4,16 +4,16 @@ windows_alias = "appflowy-windows" linux_alias = "appflowy-linux" [tasks.appflowy-macos] -dependencies = ["flowy-sdk-release"] +dependencies = ["appflowy-sdk-release"] run_task = { name = ["code_generation", "set-app-version", "flutter-build", "copy-to-product"] } script_runner = "@shell" [tasks.appflowy-windows] -dependencies = ["flowy-sdk-release"] +dependencies = ["appflowy-sdk-release"] run_task = { name = ["code_generation", "set-app-version", "flutter-build", "copy-to-product"] } [tasks.appflowy-linux] -dependencies = ["flowy-sdk-release"] +dependencies = ["appflowy-sdk-release"] run_task = { name = ["code_generation", "set-app-version", "flutter-build", "copy-to-product", "create-release-archive"] } script_runner = "@shell" @@ -23,16 +23,16 @@ windows_alias = "appflowy-windows-dev" linux_alias = "appflowy-linux-dev" [tasks.appflowy-macos-dev] -dependencies = ["flowy-sdk-dev"] +dependencies = ["appflowy-sdk-dev"] run_task = { name = ["code_generation", "set-app-version", "flutter-build", "copy-to-product"] } script_runner = "@shell" [tasks.appflowy-windows-dev] -dependencies = ["flowy-sdk-dev"] +dependencies = ["appflowy-sdk-dev"] run_task = { name = ["code_generation", "set-app-version", "flutter-build", "copy-to-product"] } [tasks.appflowy-linux-dev] -dependencies = ["flowy-sdk-dev"] +dependencies = ["appflowy-sdk-dev"] run_task = { name = ["code_generation", "set-app-version", "flutter-build", "copy-to-product"] } script_runner = "@shell"