From 673afa1fcb27e603207e6a6513d2945d7508001c Mon Sep 17 00:00:00 2001 From: Stephen Date: Sat, 20 Nov 2021 19:06:24 -0800 Subject: [PATCH 01/12] add linux build --- .github/workflows/ci.yaml | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 55bab1edc7..89a7811778 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -5,18 +5,38 @@ on: pull_request: branches: [main] jobs: - build: + build-macos: runs-on: macOS-latest steps: - name: Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v2 - name: Env install run: cd frontend && make install_rust && make install_cargo_make && cargo make install_targets - name: Run frontend tests run: cd frontend/rust-lib && cargo test - name: Run shared-lib tests run: cd shared-lib && cargo test - - - - + build-linux: + runs-on: linux-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Packages + run: sudo apt-get install -y curl build-essential libsqlite3-dev libssl-dev clang cmake ninja-build pkg-config libgtk-3-dev + - name: Rust + run: | + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh + source $HOME/.cargo/env + rustup toolchain install nightly + rustup default nightly + - name: Flutter + run: | + git clone https://github.com/flutter/flutter.git + cd flutter + echo "export PATH=\$PATH:"`pwd`"/bin" >> ~/.profile + export PATH="$PATH:`pwd`/bin" + flutter channel dev + flutter config --enable-linux-desktop + flutter doctor + - name: Deps + run: cargo install --force cargo-make && cargo install --force duckscript_cli && cargo make flowy_dev && cargo make -p development-linux-x86 pb && cargo make -p development-linux-x86 appflowy-linux-dev From 35f4aa64c4d091e26df599992fa4018a4a17687a Mon Sep 17 00:00:00 2001 From: Stephen Date: Sat, 20 Nov 2021 19:08:41 -0800 Subject: [PATCH 02/12] fix runner type to ubuntu --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 89a7811778..9412f5107d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -17,7 +17,7 @@ jobs: - name: Run shared-lib tests run: cd shared-lib && cargo test build-linux: - runs-on: linux-latest + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v2 From c6524b273fe4286d12219b230ed0e70a2a0ed237 Mon Sep 17 00:00:00 2001 From: Stephen Date: Sat, 20 Nov 2021 19:09:43 -0800 Subject: [PATCH 03/12] apt-get update --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9412f5107d..4db4fa264d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -22,7 +22,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Packages - run: sudo apt-get install -y curl build-essential libsqlite3-dev libssl-dev clang cmake ninja-build pkg-config libgtk-3-dev + run: sudo apt-get update && sudo apt-get install -y curl build-essential libsqlite3-dev libssl-dev clang cmake ninja-build pkg-config libgtk-3-dev - name: Rust run: | curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh From a008cb6bd5f5fc23b16033a1a293f04a76245a47 Mon Sep 17 00:00:00 2001 From: Stephen Date: Sat, 20 Nov 2021 19:13:04 -0800 Subject: [PATCH 04/12] try passing arg to sh --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4db4fa264d..d934964efb 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -25,7 +25,7 @@ jobs: run: sudo apt-get update && sudo apt-get install -y curl build-essential libsqlite3-dev libssl-dev clang cmake ninja-build pkg-config libgtk-3-dev - name: Rust run: | - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -- -y source $HOME/.cargo/env rustup toolchain install nightly rustup default nightly From b0ab6bdd4b3c82bd87f03c75c22700ebad6e9bff Mon Sep 17 00:00:00 2001 From: Stephen Date: Sat, 20 Nov 2021 19:15:01 -0800 Subject: [PATCH 05/12] try bash syntax --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d934964efb..f974bcc835 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -25,7 +25,7 @@ jobs: run: sudo apt-get update && sudo apt-get install -y curl build-essential libsqlite3-dev libssl-dev clang cmake ninja-build pkg-config libgtk-3-dev - name: Rust run: | - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -- -y + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y source $HOME/.cargo/env rustup toolchain install nightly rustup default nightly From d4432eabb98864164efa0e43fccb3bf7cb7e4eb2 Mon Sep 17 00:00:00 2001 From: Stephen Date: Sat, 20 Nov 2021 19:31:37 -0800 Subject: [PATCH 06/12] move to frontend --- .github/workflows/ci.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f974bcc835..f34e8bdab4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -39,4 +39,10 @@ jobs: flutter config --enable-linux-desktop flutter doctor - name: Deps - run: cargo install --force cargo-make && cargo install --force duckscript_cli && cargo make flowy_dev && cargo make -p development-linux-x86 pb && cargo make -p development-linux-x86 appflowy-linux-dev + run: | + cargo install --force cargo-make + cargo install --force duckscript_cli + cd frontend + cargo make flowy_dev + cargo make -p development-linux-x86 pb + cargo make -p development-linux-x86 appflowy-linux-dev From ac9a89fdcab47307368ab372cd89938763ef0578 Mon Sep 17 00:00:00 2001 From: Stephen Date: Sat, 20 Nov 2021 19:47:31 -0800 Subject: [PATCH 07/12] install dart --- .github/workflows/ci.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f34e8bdab4..3b035a28e9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -29,6 +29,12 @@ jobs: source $HOME/.cargo/env rustup toolchain install nightly rustup default nightly + - name: Dart + run: | + sudo wget -qO /etc/apt/trusted.gpg.d/dart_linux_signing_key.asc https://dl-ssl.google.com/linux/linux_signing_key.pub + sudo wget -qO /etc/apt/sources.list.d/dart_stable.list https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list + sudo apt update + sudo apt install -y dart - name: Flutter run: | git clone https://github.com/flutter/flutter.git From ccf7ff888887d13b6173c453d4a92fda18c26a57 Mon Sep 17 00:00:00 2001 From: Stephen Date: Sat, 20 Nov 2021 19:53:26 -0800 Subject: [PATCH 08/12] cleanup build steps --- .github/workflows/ci.yaml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3b035a28e9..4233bf6261 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,25 +16,23 @@ jobs: run: cd frontend/rust-lib && cargo test - name: Run shared-lib tests run: cd shared-lib && cargo test - build-linux: + build-ubuntu: runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v2 - name: Packages - run: sudo apt-get update && sudo apt-get install -y curl build-essential libsqlite3-dev libssl-dev clang cmake ninja-build pkg-config libgtk-3-dev + run: | + sudo wget -qO /etc/apt/trusted.gpg.d/dart_linux_signing_key.asc https://dl-ssl.google.com/linux/linux_signing_key.pub + sudo wget -qO /etc/apt/sources.list.d/dart_stable.list https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list + sudo apt-get update + sudo apt-get install -y dart curl build-essential libsqlite3-dev libssl-dev clang cmake ninja-build pkg-config libgtk-3-dev - name: Rust run: | curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y source $HOME/.cargo/env rustup toolchain install nightly rustup default nightly - - name: Dart - run: | - sudo wget -qO /etc/apt/trusted.gpg.d/dart_linux_signing_key.asc https://dl-ssl.google.com/linux/linux_signing_key.pub - sudo wget -qO /etc/apt/sources.list.d/dart_stable.list https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list - sudo apt update - sudo apt install -y dart - name: Flutter run: | git clone https://github.com/flutter/flutter.git From e713a6dfc617c7ae7921f8ff62db1d11abdecd19 Mon Sep 17 00:00:00 2001 From: Stephen Date: Sat, 20 Nov 2021 20:03:15 -0800 Subject: [PATCH 09/12] move installs --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4233bf6261..06fcb569a9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -44,9 +44,9 @@ jobs: flutter doctor - name: Deps run: | + cd frontend cargo install --force cargo-make cargo install --force duckscript_cli - cd frontend cargo make flowy_dev cargo make -p development-linux-x86 pb cargo make -p development-linux-x86 appflowy-linux-dev From 169f1e2c44e0b01f1ab0f98cb1977ddf9247e661 Mon Sep 17 00:00:00 2001 From: Stephen Date: Sat, 20 Nov 2021 20:23:16 -0800 Subject: [PATCH 10/12] add another relative path not sure why --- frontend/scripts/flowy-tool/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/scripts/flowy-tool/Cargo.toml b/frontend/scripts/flowy-tool/Cargo.toml index 12d10fbe50..4d3fbd9f2f 100644 --- a/frontend/scripts/flowy-tool/Cargo.toml +++ b/frontend/scripts/flowy-tool/Cargo.toml @@ -14,7 +14,7 @@ log = "0.4.11" env_logger = "0.8.2" #shell = { git="https://github.com/google/rust-shell.git"} cmd_lib = "1.1" -flowy-ast = { path = "../../shared-lib/flowy-ast" } +flowy-ast = { path = "../../../shared-lib/flowy-ast" } console = "0.14.0" fancy-regex = "0.5.0" lazy_static = "1.4.0" @@ -24,4 +24,4 @@ dialoguer = "0.8.0" toml = "0.5.8" serde = { version = "1.0", features = ["derive"] } pathdiff = "0.2.0" -itertools = "0.10" \ No newline at end of file +itertools = "0.10" From 43248970541f8cf9df73d982ffb49fb2166ca49e Mon Sep 17 00:00:00 2001 From: Stephen Date: Sat, 20 Nov 2021 20:38:37 -0800 Subject: [PATCH 11/12] add to github path --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 06fcb569a9..d5e4bab797 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -37,7 +37,7 @@ jobs: run: | git clone https://github.com/flutter/flutter.git cd flutter - echo "export PATH=\$PATH:"`pwd`"/bin" >> ~/.profile + echo `pwd`"/bin" >> $GITHUB_PATH export PATH="$PATH:`pwd`/bin" flutter channel dev flutter config --enable-linux-desktop From 32949d0395b1268bf0218bd1416870dad80a2cf7 Mon Sep 17 00:00:00 2001 From: Stephen Date: Sun, 21 Nov 2021 08:26:33 -0800 Subject: [PATCH 12/12] try without protobuf --- .github/workflows/ci.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d5e4bab797..9faf4070f7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -48,5 +48,4 @@ jobs: cargo install --force cargo-make cargo install --force duckscript_cli cargo make flowy_dev - cargo make -p development-linux-x86 pb cargo make -p development-linux-x86 appflowy-linux-dev