From 370e18aee8475517a2ad85ff97ebd8f3133ae4c5 Mon Sep 17 00:00:00 2001 From: Speak2Erase Date: Mon, 12 Feb 2024 16:30:22 -0800 Subject: [PATCH] Fix actions --- .github/workflows/ci.yml | 6 ++++-- .github/workflows/deploy.yml | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e3e59c..44b38b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,8 +48,10 @@ jobs: targets: wasm32-unknown-unknown components: rust-src - - name: Download and install Trunk - run: cargo install trunk --locked + # Cargo will error if we try to install the same binary multiple times, so we bypass cargo + # (No idea why, it doesn't happen in my testing) + - name: Download and install Trunk binary + run: wget -qO- https://github.com/trunk-rs/trunk/releases/download/v0.18.7/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf- -C ~/.cargo/bin - name: Build luminol (Release) run: cd build-luminol && ./build_luminol.sh diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f3482e1..f2a2d4f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -38,9 +38,11 @@ jobs: toolchain: nightly-2023-11-14 targets: wasm32-unknown-unknown components: rust-src - - - name: Download and install Trunk - run: cargo install trunk --locked + + # Cargo will error if we try to install the same binary multiple times, so we bypass cargo + # (No idea why, it doesn't happen in my testing) + - name: Download and install Trunk binary + run: wget -qO- https://github.com/trunk-rs/trunk/releases/download/v0.18.7/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf- -C ~/.cargo/bin - name: Build luminol (Release) run: cd build-luminol && ./build_luminol.sh