update treefmt configuration

This commit is contained in:
Jörg Thalheim 2024-07-15 10:54:23 +02:00
parent 9734eba858
commit a51bd670d6
4 changed files with 16 additions and 20 deletions

View file

@ -10,17 +10,16 @@ jobs:
tests: tests:
strategy: strategy:
matrix: matrix:
os: [ ubuntu-latest ] os: [ubuntu-latest]
# FIXME macos garbage currently collect also nix-shell that runs the test # FIXME macos garbage currently collect also nix-shell that runs the test
#os: [ ubuntu-latest, macos-latest ] #os: [ ubuntu-latest, macos-latest ]
variants: [ stable, latest, bash4 ] variants: [stable, latest, bash4]
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: cachix/install-nix-action@V27 - uses: cachix/install-nix-action@V27
with: with:
nix_path: nixpkgs=channel:nixpkgs-unstable nix_path: nixpkgs=channel:nixpkgs-unstable
extra_nix_config: | extra_nix_config: |
experimental-features = nix-command flakes experimental-features = nix-command flakes
- run: - run: "nix run --accept-flake-config .#test-runner-${{ matrix.variants }}"
"nix run --accept-flake-config .#test-runner-${{ matrix.variants }}"

View file

@ -24,5 +24,5 @@ jobs:
``` ```
{{ env.GIT_COMMIT_MESSAGE }} {{ env.GIT_COMMIT_MESSAGE }}
``` ```
pr-labels: | # Labels to be set on the PR pr-labels: | # Labels to be set on the PR
merge-queue merge-queue

View file

@ -1,5 +1,5 @@
# shellcheck shell=bash # shellcheck shell=bash
if ! has nix_direnv_version || ! nix_direnv_version 3.0.5; then if ! has nix_direnv_version || ! nix_direnv_version 3.0.5; then
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.5/direnvrc" "sha256-RuwIS+QKFj/T9M2TFXScjBsLR6V3A17YVoEW/Q6AZ1w=" source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.5/direnvrc" "sha256-RuwIS+QKFj/T9M2TFXScjBsLR6V3A17YVoEW/Q6AZ1w="
fi fi
use flake use flake

View file

@ -18,16 +18,13 @@
shellcheck.enable = true; shellcheck.enable = true;
shfmt.enable = true; shfmt.enable = true;
statix.enable = true; statix.enable = true;
yamlfmt.enable = true;
}; };
settings.formatter = settings.formatter = {
let shellcheck.includes = [ "direnvrc" ];
shellIncludes = [ "*.sh" "direnvrc" ]; shfmt.includes = [ "direnvrc" ];
in };
{
shellcheck.includes = shellIncludes;
shfmt.includes = shellIncludes;
};
}; };
}; };
} }