Merge pull request 'add a nix-flake runner' (#1 ) from pjjw/nix-flake-runner into master

Reviewed-on: sbl/docker-nixpkgs#1
Merge branch 'master' into pjjw/nix-flake-runner
2026-01-12 12:50:36 -05:00 · 2023-09-09 21:04:42 -04:00 · 2023-09-08 12:24:40 -04:00 · 2023-09-08 12:24:27 -04:00 · 2023-09-07 16:06:59 -04:00 · 2023-09-07 15:44:37 -04:00
2 changed files with 13 additions and 2 deletions
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -18,11 +18,12 @@ jobs:
          - nixos-unstable
          - nixos-22.11
          - nixos-23.05
-    runs-on: ubuntu-latest
+    runs-on: native
+    container: pjjw/nix-flake-runner:1
    steps:
      - uses: actions/checkout@v3
-      - uses: cachix/install-nix-action@v22
      - run: nix-shell --run ./ci.sh
        env:
+          CI_PROJECT_PATH: pjjw
          CI_REGISTRY_AUTH: '${{ secrets.REGISTRY_AUTH }}'
          NIXPKGS_CHANNEL: '${{ matrix.channel }}'
--- a/images/nix-flakes-runner/default.nix
+++ b/images/nix-flakes-runner/default.nix
@@ -0,0 +1,10 @@
+{ docker-nixpkgs
+, nodejs
+, extraContents ? [ ]
+}:
+docker-nixpkgs.nix-flakes.override {
+  extraContents = [
+    # nodejs for runner
+    nodejs
+  ] ++ extraContents;
+}
Author	SHA1	Message	Date
pjjw	d8d767b117	Merge pull request 'add a nix-flake runner' (#1 ) from pjjw/nix-flake-runner into master Reviewed-on: sbl/docker-nixpkgs#1	2023-09-09 21:04:42 -04:00
pjjw	09896ba4d9	Merge branch 'master' into pjjw/nix-flake-runner	2023-09-08 12:24:40 -04:00
pjjw	1cc157b032	Merge pull request 'cachix action failing for unknown reasons, patch to use local runner' (#2 ) from pjjw/gitea-actions into master Reviewed-on: sbl/docker-nixpkgs#2	2023-09-08 12:24:27 -04:00
Peter Woodman	617b5494c1	cachix action failing for unknown reasons, patch to use local runner	2023-09-07 16:06:59 -04:00
Peter Woodman	183980b7bb	add a nix-flake runner	2023-09-07 15:44:37 -04:00