From 17c8f9fdde036781f63bfd8b0fdfa8850ffd92fc Mon Sep 17 00:00:00 2001 From: appflowy Date: Wed, 9 Feb 2022 20:46:39 +0800 Subject: [PATCH] ci: rename ci & fix generate language file command error --- .../{frontend_dart.yml => dart_lint.yml} | 6 ++-- .../{frontend_rust.yml => rust_lint.yml} | 29 ++------------- .github/workflows/rust_test.yml | 36 +++++++++++++++++++ 3 files changed, 41 insertions(+), 30 deletions(-) rename .github/workflows/{frontend_dart.yml => dart_lint.yml} (90%) rename .github/workflows/{frontend_rust.yml => rust_lint.yml} (55%) create mode 100644 .github/workflows/rust_test.yml diff --git a/.github/workflows/frontend_dart.yml b/.github/workflows/dart_lint.yml similarity index 90% rename from .github/workflows/frontend_dart.yml rename to .github/workflows/dart_lint.yml index 6a7dd9d26e..2c1bb495e8 100644 --- a/.github/workflows/frontend_dart.yml +++ b/.github/workflows/dart_lint.yml @@ -3,14 +3,13 @@ # separate terms of service, privacy policy, and support # documentation. -name: Frontend_Dart +name: DartLint on: push: branches: [ main ] pull_request: branches: [ main ] - env: @@ -26,10 +25,11 @@ jobs: - uses: subosito/flutter-action@v1 with: channel: "dev" - - name: flutter pub get + - name: Generate language files working-directory: frontend/app_flowy run: flutter pub get + flutter pub add easy_localization flutter pub run easy_localization:generate -S assets/translations/ flutter pub run easy_localization:generate -f keys -o locale_keys.g.dart -S assets/translations -s en.json - name: flutter analyze diff --git a/.github/workflows/frontend_rust.yml b/.github/workflows/rust_lint.yml similarity index 55% rename from .github/workflows/frontend_rust.yml rename to .github/workflows/rust_lint.yml index 58954b844e..fac625b5a5 100644 --- a/.github/workflows/frontend_rust.yml +++ b/.github/workflows/rust_lint.yml @@ -1,4 +1,4 @@ -name: Frontend_Rust +name: RustLint on: push: @@ -43,29 +43,4 @@ jobs: - run: rustup component add clippy working-directory: frontend/rust-lib - run: cargo clippy - working-directory: frontend/rust-lib - - tests: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Install Rust - run: | - curl \ - --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y - source $HOME/.cargo/env - rustup toolchain install stable - rustup default stable - - name: Install protobuf tool - - run: - cargo install --force cargo-make - cargo make flowy_dev - echo PATH="$PATH":"$HOME/.pub-cache/bin" >> $GITHUB_PATH - working-directory: frontend - - name: Frontend tests - working-directory: frontend/rust-lib - run: cargo test - - name: Shared-lib tests - working-directory: shared-lib - run: cargo test + working-directory: frontend/rust-lib \ No newline at end of file diff --git a/.github/workflows/rust_test.yml b/.github/workflows/rust_test.yml new file mode 100644 index 0000000000..c2f09f78dd --- /dev/null +++ b/.github/workflows/rust_test.yml @@ -0,0 +1,36 @@ +name: RustLint + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +env: + CARGO_TERM_COLOR: always + +jobs: + tests: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Install Rust + run: | + curl \ + --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y + source $HOME/.cargo/env + rustup toolchain install stable + rustup default stable + - name: Install protobuf tool + - run: + cargo install --force cargo-make + cargo make flowy_dev + echo PATH="$PATH":"$HOME/.pub-cache/bin" >> $GITHUB_PATH + working-directory: frontend + - name: Frontend tests + working-directory: frontend/rust-lib + run: cargo test + - name: Shared-lib tests + working-directory: shared-lib + run: cargo test