Skip to content

Commit 1b295c0

Browse files
committed
chore: Merge branch 'main' into release/0.0.9.1
2 parents da1b094 + 9215f51 commit 1b295c0

File tree

654 files changed

+8018
-3962
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

654 files changed

+8018
-3962
lines changed

.github/workflows/appflowy_editor_test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ on:
1515

1616
env:
1717
CARGO_TERM_COLOR: always
18+
FLUTTER_VERSION: "3.3.9"
1819

1920
jobs:
2021
tests:
@@ -30,7 +31,7 @@ jobs:
3031
- uses: subosito/flutter-action@v2
3132
with:
3233
channel: "stable"
33-
flutter-version: "3.0.5"
34+
flutter-version: ${{ env.FLUTTER_VERSION }}
3435
cache: true
3536

3637
- name: Run FlowyEditor tests

.github/workflows/dart_lint.yml

Lines changed: 0 additions & 86 deletions
This file was deleted.

.github/workflows/dart_test.yml

Lines changed: 0 additions & 80 deletions
This file was deleted.
Lines changed: 43 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,87 @@
1-
name: CI
1+
name: Flutter-CI
22

33
on:
44
push:
55
branches:
66
- "main"
77
- "release/*"
8+
paths:
9+
- "frontend/**"
810

911
pull_request:
1012
branches:
1113
- "main"
1214
- "release/*"
15+
paths:
16+
- "frontend/**"
17+
18+
env:
19+
FLUTTER_VERSION: "3.3.9"
20+
RUST_TOOLCHAIN: "1.65"
1321

1422
jobs:
1523
build:
1624
strategy:
25+
fail-fast: false
1726
matrix:
1827
os: [ubuntu-latest, macos-latest, windows-latest]
1928
include:
2029
- os: ubuntu-latest
2130
flutter_profile: development-linux-x86_64
31+
target: x86_64-unknown-linux-gnu
2232
- os: macos-latest
2333
flutter_profile: development-mac-x86_64
34+
target: x86_64-apple-darwin
2435
- os: windows-latest
2536
flutter_profile: development-windows-x86
37+
target: x86_64-pc-windows-msvc
2638
runs-on: ${{ matrix.os }}
2739

2840
steps:
29-
- uses: actions/checkout@v2
41+
- name: Checkout source code
42+
uses: actions/checkout@v2
3043

31-
- id: rust_toolchain
44+
- name: Install Rust toolchain
45+
id: rust_toolchain
3246
uses: actions-rs/toolchain@v1
3347
with:
34-
toolchain: "stable-2022-04-07"
48+
toolchain: ${{ env.RUST_TOOLCHAIN }}
49+
target: ${{ matrix.target }}
50+
override: true
51+
profile: minimal
3552

36-
- id: flutter
53+
- name: Install flutter
54+
id: flutter
3755
uses: subosito/flutter-action@v2
3856
with:
3957
channel: "stable"
58+
flutter-version: ${{ env.FLUTTER_VERSION }}
4059
cache: true
41-
flutter-version: "3.0.5"
42-
43-
- name: Cache Cargo
44-
id: cache-cargo
45-
uses: actions/cache@v2
46-
with:
47-
path: |
48-
~/.cargo
49-
key: ${{ runner.os }}-cargo-${{ steps.rust_toolchain.outputs.rustc_hash }}-${{ hashFiles('./frontend/rust-lib/Cargo.toml') }}
5060

51-
- name: Cache Rust
52-
uses: actions/cache@v2
61+
- uses: Swatinem/rust-cache@v2
5362
with:
54-
path: |
55-
frontend/rust-lib/target
56-
shared-lib/target
57-
key: ${{ runner.os }}-rust-rust-lib-share-lib-${{ steps.rust_toolchain.outputs.rustc_hash }}-${{ hashFiles('./frontend/rust-lib/Cargo.toml') }}
63+
prefix-key: ${{ matrix.job.os }}
5864

59-
- name: Setup Environment
65+
- name: Install prerequisites
66+
working-directory: frontend
6067
run: |
68+
cargo install --force cargo-make
69+
cargo install --force duckscript_cli
6170
if [ "$RUNNER_OS" == "Linux" ]; then
6271
sudo wget -qO /etc/apt/trusted.gpg.d/dart_linux_signing_key.asc https://dl-ssl.google.com/linux/linux_signing_key.pub
6372
sudo wget -qO /etc/apt/sources.list.d/dart_stable.list https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list
6473
sudo apt-get update
65-
sudo apt-get install -y dart curl build-essential libsqlite3-dev libssl-dev clang cmake ninja-build pkg-config libgtk-3-dev
74+
sudo apt-get install -y dart curl build-essential libssl-dev clang cmake ninja-build pkg-config libgtk-3-dev
6675
sudo apt-get install keybinder-3.0
6776
elif [ "$RUNNER_OS" == "Windows" ]; then
6877
vcpkg integrate install
6978
elif [ "$RUNNER_OS" == "macOS" ]; then
7079
echo 'do nothing'
7180
fi
72-
shell: bash
73-
74-
- if: steps.cache-cargo.outputs.cache-hit != 'true'
75-
name: Deps
76-
working-directory: frontend
77-
run: |
78-
cargo install cargo-make
79-
cargo install duckscript_cli
80-
81-
- name: Cargo make appflowy-deps-tools
82-
working-directory: frontend
83-
run: |
8481
cargo make appflowy-deps-tools
82+
shell: bash
8583

86-
- name: Config Flutter
84+
- name: Enable Flutter Desktop
8785
run: |
8886
if [ "$RUNNER_OS" == "Linux" ]; then
8987
flutter config --enable-linux-desktop
@@ -94,7 +92,16 @@ jobs:
9492
fi
9593
shell: bash
9694

97-
- name: Build
95+
- name: Build AppFlowy
9896
working-directory: frontend
9997
run: |
10098
cargo make --profile ${{ matrix.flutter_profile }} appflowy-dev
99+
100+
- name: Flutter Analyzer
101+
working-directory: frontend/app_flowy
102+
run: flutter analyze
103+
104+
- name: Run Flutter unit tests
105+
working-directory: frontend
106+
run: |
107+
cargo make dart_unit_test

.github/workflows/integration_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- uses: subosito/flutter-action@v2
3636
with:
3737
channel: "stable"
38-
flutter-version: "3.0.5"
38+
flutter-version: "3.3.9"
3939
cache: true
4040

4141
- name: Cache Cargo

0 commit comments

Comments
 (0)