diff options
| author | Brooks Rady <b.j.rady@gmail.com> | 2021-02-23 17:07:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-23 17:07:22 +0000 |
| commit | e46901a52faf8fe4fc30d11169459cc0cea4fa81 (patch) | |
| tree | cf4623420f89c1f0e6f939278ce2b5ae40916ece | |
| parent | build(simplify and fix build system, removing the binary assets) (diff) | |
| parent | Sweet victory (and a README update) (diff) | |
| download | sl0ppij-e46901a52faf8fe4fc30d11169459cc0cea4fa81.tar.gz sl0ppij-e46901a52faf8fe4fc30d11169459cc0cea4fa81.tar.xz sl0ppij-e46901a52faf8fe4fc30d11169459cc0cea4fa81.zip | |
build(fix the CI with the new build system)
Also added new instructions for running in the README
| -rw-r--r-- | .github/workflows/rust.yml | 4 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rwxr-xr-x | build-all.sh | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index b9cd153d..29aa721a 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -19,7 +19,7 @@ jobs: - name: Add WASM target run: rustup target add wasm32-wasi - name: Build - run: cargo build --verbose + run: ./build-all.sh --verbose - name: Run tests run: cargo test -j 1 --verbose fmt: @@ -50,6 +50,8 @@ jobs: components: clippy - name: Add WASM target run: rustup target add wasm32-wasi + - name: Build + run: ./build-all.sh --verbose - uses: actions-rs/cargo@v1 with: command: clippy @@ -30,7 +30,7 @@ Zellij was initially called "Mosaic". ## How to use it? * Clone the project -* In the project folder, run: `cargo run` +* In the project folder, run: `./build-all.sh && cargo run` (note that right now Zellij only supports linux and mac) diff --git a/build-all.sh b/build-all.sh index 67e36071..3243ea45 100755 --- a/build-all.sh +++ b/build-all.sh @@ -13,7 +13,7 @@ cd ../strider cargo build --release echo "Optimising WASM executables (4/5)..." cd ../.. -wasm-opt -O target/wasm32-wasi/release/status-bar.wasm -o target/status-bar.wasm -wasm-opt -O target/wasm32-wasi/release/strider.wasm -o target/strider.wasm +wasm-opt -O target/wasm32-wasi/release/status-bar.wasm -o target/status-bar.wasm || cp target/wasm32-wasi/release/status-bar.wasm target/status-bar.wasm +wasm-opt -O target/wasm32-wasi/release/strider.wasm -o target/strider.wasm || cp target/wasm32-wasi/release/strider.wasm target/strider.wasm echo "Building zellij (5/5)..." cargo build $@
\ No newline at end of file |