From 9e1d36462fcd43d6559f48e53f3168565c72df0c Mon Sep 17 00:00:00 2001 From: Mattias Kockum Date: Tue, 11 Aug 2026 23:14:04 +0200 Subject: [PATCH] ci: fix attribute paths in pre-commit workflow --- .github/workflows/pre-commit.yaml | 10 ++++++---- workflows/pre-commit.nix | 12 +++++++----- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml index 40bbbd5..6d9dd8b 100644 --- a/.github/workflows/pre-commit.yaml +++ b/.github/workflows/pre-commit.yaml @@ -9,11 +9,13 @@ jobs: uses: samueldr/lix-gha-installer-action@8c7f8a4b0f594ab8a6dc3bf71c217587bbc756b5 - name: Check stage pre-commit - run: "nix-shell -A pre-commit --run 'set -o pipefail\nset -o nounset\nset -o - errexit\npre-commit run --all-files --hook-stage pre-commit --show-diff-on-failure'" + run: "\t set -o pipefail\n\t set -o nounset\n\t set -o errexit\n\t nix-shell + --run 'pre-commit run --all-files --hook-stage pre-commit --show-diff-on-failure'\n\ + \t" - name: Check stage pre-push - run: "nix-shell -A pre-commit --run 'set -o pipefail\nset -o nounset\nset -o - errexit\npre-commit run --all-files --hook-stage pre-push --show-diff-on-failure'" + run: "\t set -o pipefail\n\t set -o nounset\n\t set -o errexit\n\t nix-shell + --run 'pre-commit run --all-files --hook-stage pre-push --show-diff-on-failure'\n\ + \t" name: Run pre-commit on all files on: - push diff --git a/workflows/pre-commit.nix b/workflows/pre-commit.nix index 1698e0b..8a160b0 100644 --- a/workflows/pre-commit.nix +++ b/workflows/pre-commit.nix @@ -21,13 +21,15 @@ } ] # Inspired by DGNum's way of checking for pre-commit hooks. - ++ (builtins.map + ++ (map (stage: { name = "Check stage ${stage}"; - run = nix-actions.lib.nix-shell { - script = "pre-commit run --all-files --hook-stage ${stage} --show-diff-on-failure"; - shell = "pre-commit"; - }; + run = '' + set -o pipefail + set -o nounset + set -o errexit + nix-shell --run 'pre-commit run --all-files --hook-stage ${stage} --show-diff-on-failure' + ''; }) [ "pre-commit"