From aced318596f4ff2b9dd6a10a3fb72ba8dceb060a Mon Sep 17 00:00:00 2001 From: Brooks J Rady Date: Tue, 23 Feb 2021 16:24:04 +0000 Subject: [PATCH 1/7] Maybe fix the build CI --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index b9cd153d..905a8f74 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: From c06d464c65fa9b05f070e2248d3b23e9540a5d5d Mon Sep 17 00:00:00 2001 From: Brooks J Rady Date: Tue, 23 Feb 2021 16:33:16 +0000 Subject: [PATCH 2/7] More shots in the dark --- .github/workflows/rust.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 905a8f74..d8d6ed43 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -18,6 +18,8 @@ jobs: - uses: actions/checkout@v2 - name: Add WASM target run: rustup target add wasm32-wasi + - name: Install wasm-opt (binaryen) + run: apt install binaryen - name: Build run: ./build-all.sh --verbose - name: Run tests From bff58a0a8a421ee79f1455b5c6bf5c59b236251e Mon Sep 17 00:00:00 2001 From: Brooks J Rady Date: Tue, 23 Feb 2021 16:36:18 +0000 Subject: [PATCH 3/7] Yolo --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index d8d6ed43..420eae12 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: Install wasm-opt (binaryen) - run: apt install binaryen + run: sudo apt-get -y install binaryen - name: Build run: ./build-all.sh --verbose - name: Run tests From d05516ce24d6f21fc17804d994b9f3dd3acf4089 Mon Sep 17 00:00:00 2001 From: Brooks J Rady Date: Tue, 23 Feb 2021 16:41:23 +0000 Subject: [PATCH 4/7] Ubuntu is rubbish, arch ftw <3 --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 420eae12..b12c1966 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: Install wasm-opt (binaryen) - run: sudo apt-get -y install binaryen + run: sudo apt-get update && sudo apt-get -y install binaryen - name: Build run: ./build-all.sh --verbose - name: Run tests From 701374f3fe782debdce08a2cbd3913f645e0f570 Mon Sep 17 00:00:00 2001 From: Brooks J Rady Date: Tue, 23 Feb 2021 16:47:22 +0000 Subject: [PATCH 5/7] Everything is rubbish - if you can't beat them, join them --- .github/workflows/rust.yml | 2 -- build-all.sh | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index b12c1966..905a8f74 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -18,8 +18,6 @@ jobs: - uses: actions/checkout@v2 - name: Add WASM target run: rustup target add wasm32-wasi - - name: Install wasm-opt (binaryen) - run: sudo apt-get update && sudo apt-get -y install binaryen - name: Build run: ./build-all.sh --verbose - name: Run tests 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 From 08ffc153e1e87a9dc6248c73ab046cd4b0b8d1c7 Mon Sep 17 00:00:00 2001 From: Brooks J Rady Date: Tue, 23 Feb 2021 16:57:17 +0000 Subject: [PATCH 6/7] Now it's exhausting --- .github/workflows/rust.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 905a8f74..29aa721a 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -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 From 1759fe9538f3a4c3553227b28adede7844e8b238 Mon Sep 17 00:00:00 2001 From: Brooks J Rady Date: Tue, 23 Feb 2021 17:06:22 +0000 Subject: [PATCH 7/7] Sweet victory (and a README update) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)