diff --git a/.forgejo/workflows/check-meta.yaml b/.forgejo/workflows/check-meta.yaml index 035f953..b9cdc8d 100644 --- a/.forgejo/workflows/check-meta.yaml +++ b/.forgejo/workflows/check-meta.yaml @@ -1,3 +1,5 @@ +### +# This file was automatically generated with nix-actions. jobs: check_dns: runs-on: nix diff --git a/.forgejo/workflows/check-workflows.yaml b/.forgejo/workflows/check-workflows.yaml index b5936ae..a20ffa0 100644 --- a/.forgejo/workflows/check-workflows.yaml +++ b/.forgejo/workflows/check-workflows.yaml @@ -1,8 +1,11 @@ +### +# This file was automatically generated with nix-actions. jobs: check_workflows: runs-on: nix steps: - uses: actions/checkout@v3 + with: {} - name: Check that the workflows are up to date run: nix-shell -A check-workflows --run '[ $(git status --porcelain | wc -l) -eq 0 ]' diff --git a/.forgejo/workflows/eval-nodes.yaml b/.forgejo/workflows/eval-nodes.yaml index b39bb0f..53d7bbe 100644 --- a/.forgejo/workflows/eval-nodes.yaml +++ b/.forgejo/workflows/eval-nodes.yaml @@ -1,3 +1,5 @@ +### +# This file was automatically generated with nix-actions. jobs: ap01: runs-on: nix diff --git a/.forgejo/workflows/eval-shell.yaml b/.forgejo/workflows/eval-shell.yaml index 7d5bae6..c396679 100644 --- a/.forgejo/workflows/eval-shell.yaml +++ b/.forgejo/workflows/eval-shell.yaml @@ -1,3 +1,5 @@ +### +# This file was automatically generated with nix-actions. jobs: build-shell: runs-on: nix @@ -8,7 +10,7 @@ jobs: STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} STORE_USER: admin name: Build and cache shell - run: nix-shell -A eval-shell --run "nix-build-and-cache -A devShell" + run: nix-shell -A eval-shell --run 'nix-build-and-cache -A devShell' name: Build the shell on: pull_request: diff --git a/.forgejo/workflows/npins-update.yaml b/.forgejo/workflows/npins-update.yaml index 557845e..bdf3a39 100644 --- a/.forgejo/workflows/npins-update.yaml +++ b/.forgejo/workflows/npins-update.yaml @@ -1,3 +1,5 @@ +### +# This file was automatically generated with nix-actions. env: GIT_AUTHOR_EMAIL: chores@mail.hubrecht.ovh GIT_AUTHOR_NAME: HT Chores diff --git a/.forgejo/workflows/pre-commit.yaml b/.forgejo/workflows/pre-commit.yaml index 25324c1..87bbc68 100644 --- a/.forgejo/workflows/pre-commit.yaml +++ b/.forgejo/workflows/pre-commit.yaml @@ -1,3 +1,5 @@ +### +# This file was automatically generated with nix-actions. jobs: pre-commit: runs-on: nix diff --git a/npins/sources.json b/npins/sources.json index 490b25b..9d5d61c 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -225,10 +225,10 @@ "pre_releases": false, "version_upper_bound": null, "release_prefix": null, - "version": "v0.3.0", - "revision": "15a5f4cd9909cad78c8be852d176def42d5ab3cd", + "version": "v0.4.2", + "revision": "6cf7970c0916cc3c05b5289d28ec89b4e35b6e5b", "url": null, - "hash": "16gssfs2qxy1nqnfqpbn076i79zna295jzix897346ic3gy11610" + "hash": "0y9z1l1b6g1nj7l3xypbs1fnlad31ny7n8v23n35hd6nbwyslikf" }, "nix-modules": { "type": "Git", diff --git a/workflows/check-workflows.nix b/workflows/check-workflows.nix index c909615..e0996c4 100644 --- a/workflows/check-workflows.nix +++ b/workflows/check-workflows.nix @@ -2,6 +2,8 @@ # # SPDX-License-Identifier: EUPL-1.2 +{ nix-actions, ... }: + { name = "Check workflows"; on = { @@ -13,10 +15,13 @@ check_workflows = { runs-on = "nix"; steps = [ - { uses = "actions/checkout@v3"; } + (nix-actions.steps.checkout { }) { name = "Check that the workflows are up to date"; - run = "nix-shell -A check-workflows --run '[ $(git status --porcelain | wc -l) -eq 0 ]'"; + run = nix-actions.lib.nix-shell { + script = "[ $(git status --porcelain | wc -l) -eq 0 ]"; + shell = "check-workflows"; + }; } ]; }; diff --git a/workflows/eval-nodes.nix b/workflows/eval-nodes.nix index e2b904d..d7f919f 100644 --- a/workflows/eval-nodes.nix +++ b/workflows/eval-nodes.nix @@ -23,7 +23,10 @@ in { uses = "actions/checkout@v3"; } { name = "Build and cache ${node}"; - run = "nix-shell -A eval-nodes --run cache-node"; + run = nix-actions.lib.nix-shell { + script = "cache-node"; + shell = "eval-nodes"; + }; env = { STORE_ENDPOINT = "https://tvix-store.dgnum.eu/infra-signing/"; STORE_USER = "admin"; diff --git a/workflows/eval-shell.nix b/workflows/eval-shell.nix index 93540be..8190c00 100644 --- a/workflows/eval-shell.nix +++ b/workflows/eval-shell.nix @@ -18,7 +18,10 @@ { uses = "actions/checkout@v3"; } { name = "Build and cache shell"; - run = ''nix-shell -A eval-shell --run "nix-build-and-cache -A devShell"''; + run = nix-actions.lib.nix-shell { + script = "nix-build-and-cache -A devShell"; + shell = "eval-shell"; + }; env = { STORE_ENDPOINT = "https://tvix-store.dgnum.eu/infra-signing/"; STORE_USER = "admin"; diff --git a/workflows/pre-commit.nix b/workflows/pre-commit.nix index 3c7cb81..8be9a17 100644 --- a/workflows/pre-commit.nix +++ b/workflows/pre-commit.nix @@ -2,6 +2,8 @@ # # SPDX-License-Identifier: EUPL-1.2 +{ nix-actions, ... }: + { name = "Run pre-commit on all files"; on = [ @@ -16,7 +18,10 @@ ++ (builtins.map (stage: { name = "Check stage ${stage}"; - run = "nix-shell -A pre-commit --run 'pre-commit run --all-files --hook-stage ${stage} --show-diff-on-failure'"; + run = nix-actions.lib.nix-shell { + script = "pre-commit run --all-files --hook-stage ${stage} --show-diff-on-failure"; + shell = "pre-commit"; + }; }) [ "pre-commit"