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 diff --git a/README.md b/README.md index be4c49b1..f9bc9fe0 100644 --- a/README.md +++ b/README.md @@ -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