From a1a2bdab03c13c89980a989dd257ad942e852c26 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Wed, 16 Oct 2024 11:42:24 +0200 Subject: [PATCH] change woodpecker --- .woodpecker.yml | 81 ++----------------------------------------------- Cargo.lock | 2 +- 2 files changed, 4 insertions(+), 79 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index d520cef..1e96d8e 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -3,84 +3,6 @@ variables: - &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" steps: - cargo_fmt: - image: rustlang/rust:nightly - environment: - # store cargo data in repo folder so that it gets cached between steps - CARGO_HOME: .cargo_home - commands: - - rustup component add rustfmt - - cargo +nightly fmt -- --check - - leptos_fmt: - image: *rust_image - commands: - - *install_binstall - - cargo binstall -y leptosfmt - - leptosfmt -c .leptosfmt.toml --check src - - toml_fmt: - image: tamasfe/taplo:0.8.1 - commands: - - taplo format --check - - check_config_defaults_updated: - image: *rust_image - environment: - CARGO_HOME: .cargo_home - commands: - - cargo run -- --print-config > config/defaults_current.toml - - diff config/defaults.toml config/defaults_current.toml - - ignored_files: - image: alpine:3 - commands: - - apk add git - - IGNORED=$(git ls-files --cached -i --exclude-standard) - - if [[ "$IGNORED" ]]; then echo "Ignored files present:\n$IGNORED\n"; exit 1; fi - - check_diesel_schema: - image: willsquire/diesel-cli - environment: - CARGO_HOME: .cargo_home - DATABASE_URL: postgres://ibis:password@database:5432/ibis - commands: - - diesel migration run - - diesel print-schema --config-file=diesel.toml > tmp.schema - - diff tmp.schema src/backend/database/schema.rs - - frontend_wasm_build: - image: *rust_image - environment: - CARGO_HOME: .cargo_home - commands: - - "rustup target add wasm32-unknown-unknown" - - "cargo check --target wasm32-unknown-unknown --features csr,hydrate --no-default-features" - - cargo_clippy: - image: *rust_image - environment: - CARGO_HOME: .cargo_home - commands: - - rustup component add clippy - - cargo clippy --tests --all-targets --all-features - - cargo_test: - image: *rust_image - environment: - LEMMY_DATABASE_URL: postgres://ibis:password@database:5432/ibis - CARGO_HOME: .cargo_home - commands: - - apt-get update - - apt-get install postgresql sudo -y --no-install-recommends --no-install-suggests - # dbinit (used by tests to create temp db) refuses to run as root so we need to setup another user - - adduser testuser - - cp /usr/local/rustup /home/testuser/.rustup -r - - chown testuser:testuser . -R - - chown testuser:testuser /home/testuser -R - - export PATH="/usr/lib/postgresql/15/bin:/usr/local/cargo/bin:$PATH" - - sudo -u testuser env "PATH=$PATH" cargo test --no-fail-fast - build_release: image: *rust_image environment: @@ -91,7 +13,10 @@ steps: - rustup target add wasm32-unknown-unknown - ./cargo-binstall -y trunk - export PATH="$PATH:$(pwd)/.cargo_home/bin/" + - ls -lah assets + - ls -lah assets/dist - ./scripts/build_release.sh + - ls -lah assets/dist when: - event: tag 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",