From 51ada1fc4f457b964196aa65bd624cfd31b24739 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Wed, 16 Oct 2024 12:27:52 +0200 Subject: [PATCH] Fix trunk config, use specific trunk version for ci --- .woodpecker.yml | 6 +++--- Cargo.lock | 2 +- Trunk.toml | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index d520cef..534709e 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,6 +1,7 @@ variables: - &rust_image "rust:1.81" - &install_binstall "wget https://github.com/cargo-bins/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-unknown-linux-musl.tgz && tar -xvf cargo-binstall-x86_64-unknown-linux-musl.tgz && cp cargo-binstall /usr/local/cargo/bin" + - &install_trunk "cargo-binstall -y trunk@0.21.1" steps: cargo_fmt: @@ -86,10 +87,9 @@ steps: environment: CARGO_HOME: .cargo_home commands: - - wget https://github.com/cargo-bins/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-unknown-linux-musl.tgz - - tar -xvf cargo-binstall-x86_64-unknown-linux-musl.tgz + - *install_binstall - rustup target add wasm32-unknown-unknown - - ./cargo-binstall -y trunk + - *install_trunk - export PATH="$PATH:$(pwd)/.cargo_home/bin/" - ./scripts/build_release.sh when: diff --git a/Cargo.lock b/Cargo.lock index ae60312..e8032ea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1704,7 +1704,7 @@ dependencies = [ [[package]] name = "ibis" -version = "0.1.1" +version = "0.1.2" dependencies = [ "activitypub_federation", "anyhow", diff --git a/Trunk.toml b/Trunk.toml index 0a3f0cd..32505a0 100644 --- a/Trunk.toml +++ b/Trunk.toml @@ -1,3 +1,5 @@ [build] filehash = false target = "assets/index.html" +dist = "assets/dist" +minify = "on_release"