From 7f696e12848bf1c501cbbb9f2393e1aa1023635e Mon Sep 17 00:00:00 2001 From: Smaug123 <3138005+Smaug123@users.noreply.github.com> Date: Mon, 8 Sep 2025 23:24:16 +0100 Subject: [PATCH] Fix --- .github/workflows/rust.yml | 6 +++--- .woodpecker/build.yaml | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 36bdf21..2274def 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -71,7 +71,7 @@ jobs: # ] # } - alejandra: + format: { "name": "Nix formatting", "runs-on": "ubuntu-latest", @@ -86,8 +86,8 @@ jobs: "with": { "extra_nix_config": "access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}" } }, { - "name": "Run Alejandra", - "run": "nix develop .#ci --command alejandra -- --check ." + "name": "Run nixpkgs-fmt", + "run": "nix develop .#ci --command nixpkgs-fmt -- --check ." } ] } diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index 0e1d70b..4385762 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -3,17 +3,18 @@ steps: image: nixos/nix commands: - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf + # Run through Nix + - nix build + - nix run + - nix flake check # Lint - nix develop --command cargo -- fmt --all -- --check - nix develop --command cargo -- clippy -- -D warnings -W clippy::must_use_candidate - - nix develop .#ci --command alejandra -- --check . + - nix develop .#ci --command nixpkgs-fmt -- --check . - nix develop .#ci --command markdown-link-check README.md # Test - nix develop --command cargo test --verbose --release - nix develop --command cargo test --verbose - # Run through Nix - - nix build - - nix run when: - event: "push"