From 23ee7907e2bff89b596021ad4c9ec93b0f346cf1 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Thu, 16 Jan 2025 14:28:40 +0100 Subject: [PATCH] feat(reuse): Switch to an action rather than a git hook, to be less cumbersome --- .forgejo/workflows/reuse-check.yaml | 13 +++++++++++++ default.nix | 8 ++------ workflows/reuse-check.nix | 27 +++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 .forgejo/workflows/reuse-check.yaml create mode 100644 workflows/reuse-check.nix diff --git a/.forgejo/workflows/reuse-check.yaml b/.forgejo/workflows/reuse-check.yaml new file mode 100644 index 0000000..dfae738 --- /dev/null +++ b/.forgejo/workflows/reuse-check.yaml @@ -0,0 +1,13 @@ +### +# This file was automatically generated with nix-actions. +jobs: + pre-commit: + runs-on: nix + steps: + - uses: actions/checkout@v3 + - name: REUSE lint + run: nix-shell -A reuse-check --run 'reuse lint' +name: REUSE lint +on: +- push +- pull_request diff --git a/default.nix b/default.nix index 6240f6d..e2476bc 100644 --- a/default.nix +++ b/default.nix @@ -44,12 +44,6 @@ let package = pkgs.nixfmt-rfc-style; }; - reuse = nix-reuse.hook { - enable = true; - stages = [ "pre-push" ]; - package = pkgs.reuse; # git-hooks.nix is lagging on nixpkgs update - }; - commitizen.enable = true; }; }; @@ -185,6 +179,7 @@ in src = sources.nixos-generators; })) pkgs.npins + pkgs.reuse # SSO testing pkgs.kanidm @@ -216,6 +211,7 @@ in check-workflows.shellHook = workflows.shellHook; eval-nodes.packages = [ scripts.cache-node ]; eval-shell.packages = [ scripts.nix-build-and-cache ]; + reuse-check.packages = [ pkgs.reuse ]; }; }; } diff --git a/workflows/reuse-check.nix b/workflows/reuse-check.nix new file mode 100644 index 0000000..673077e --- /dev/null +++ b/workflows/reuse-check.nix @@ -0,0 +1,27 @@ +# SPDX-FileCopyrightText: 2024 Tom Hubrecht +# +# SPDX-License-Identifier: EUPL-1.2 + +{ nix-actions, ... }: + +{ + name = "REUSE lint"; + on = [ + "push" + "pull_request" + ]; + + jobs.pre-commit = { + runs-on = "nix"; + steps = [ + { uses = "actions/checkout@v3"; } + { + name = "REUSE lint"; + run = nix-actions.lib.nix-shell { + script = "reuse lint"; + shell = "reuse-check"; + }; + } + ]; + }; +} -- 2.47.0