Merge branch 'master' into pjjw/nix-flake-runner

Merge pull request 'cachix action failing for unknown reasons, patch to use local runner' (#2 ) from pjjw/gitea-actions into master
Reviewed-on: #2
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 11 additions and 0 deletions
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -24,5 +24,6 @@ jobs:
      - uses: actions/checkout@v3
      - 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	09896ba4d9	Merge branch 'master' into pjjw/nix-flake-runner All checks were successful Nix / build (nixos-22.11) (pull_request) Successful in 24m52s Details Nix / build (nixos-unstable) (pull_request) Successful in 15m51s Details Nix / build (nixos-23.05) (pull_request) Successful in 18m43s Details	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 Some checks failed Nix / build (nixos-unstable) (push) Failing after 21m13s Details Nix / build (nixos-22.11) (push) Failing after 23m58s Details Nix / build (nixos-23.05) (push) Failing after 24m32s Details Reviewed-on: #2	2023-09-08 12:24:27 -04:00
Peter Woodman	617b5494c1	cachix action failing for unknown reasons, patch to use local runner All checks were successful Nix / build (nixos-22.11) (pull_request) Successful in 23m0s Details Nix / build (nixos-unstable) (pull_request) Successful in 15m41s Details Nix / build (nixos-23.05) (pull_request) Successful in 18m47s Details	2023-09-07 16:06:59 -04:00
Peter Woodman	183980b7bb	add a nix-flake runner Some checks failed Nix / build (nixos-22.11) (pull_request) Failing after 18s Details Nix / build (nixos-23.05) (pull_request) Failing after 26s Details Nix / build (nixos-unstable) (pull_request) Failing after 26s Details	2023-09-07 15:44:37 -04:00