From d3b1db7836a831cc2bb9bc61f8b4c74252452b82 Mon Sep 17 00:00:00 2001 From: Floweynt <50057682+Floweynt@users.noreply.github.com> Date: Wed, 9 Sep 2026 20:11:43 -0500 Subject: [PATCH 01/18] try and get CI workflow to work --- .github/workflows/diff-pr.yml | 2 +- .github/workflows/diff-tag.yml | 2 +- .github/workflows/flake-check.yml | 2 +- .github/workflows/flake-update.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/vulnix.yml | 2 +- containers/server-n0/git.nix | 10 +++++++--- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/diff-pr.yml b/.github/workflows/diff-pr.yml index 7ba4bd7..e20624a 100644 --- a/.github/workflows/diff-pr.yml +++ b/.github/workflows/diff-pr.yml @@ -13,7 +13,7 @@ concurrency: jobs: dix: - runs-on: ubuntu-latest + runs-on: nix steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/diff-tag.yml b/.github/workflows/diff-tag.yml index 8224366..6e6e778 100644 --- a/.github/workflows/diff-tag.yml +++ b/.github/workflows/diff-tag.yml @@ -9,7 +9,7 @@ permissions: jobs: dix: - runs-on: ubuntu-latest + runs-on: nix steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/flake-check.yml b/.github/workflows/flake-check.yml index 452cfe6..220af69 100644 --- a/.github/workflows/flake-check.yml +++ b/.github/workflows/flake-check.yml @@ -14,7 +14,7 @@ concurrency: jobs: flake-check: - runs-on: ubuntu-latest + runs-on: nix steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/flake-update.yml b/.github/workflows/flake-update.yml index 2e57a9e..700c672 100644 --- a/.github/workflows/flake-update.yml +++ b/.github/workflows/flake-update.yml @@ -11,7 +11,7 @@ permissions: jobs: update: - runs-on: ubuntu-latest + runs-on: nix steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 89a6d6f..9dfacbc 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -15,7 +15,7 @@ concurrency: jobs: lint: - runs-on: ubuntu-latest + runs-on: nix steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/vulnix.yml b/.github/workflows/vulnix.yml index aa7e347..85fa661 100644 --- a/.github/workflows/vulnix.yml +++ b/.github/workflows/vulnix.yml @@ -11,7 +11,7 @@ permissions: jobs: scan: - runs-on: ubuntu-latest + runs-on: nix steps: - uses: actions/checkout@v4 diff --git a/containers/server-n0/git.nix b/containers/server-n0/git.nix index f4510d7..41a5e74 100644 --- a/containers/server-n0/git.nix +++ b/containers/server-n0/git.nix @@ -8,6 +8,9 @@ let inherit (dsl) mkContainer mkVm; inherit (hostInfo.paths) data secrets; + pubSshPort = 23; + intSshPort = 23 + 8000; + ciRunnerData = "${data}/web/git-ci-runner"; ciRunnerSecrets = "${secrets}/ci-runner"; in @@ -17,8 +20,8 @@ in net.access = [ { to = "@internet"; } ]; net.forward.tcp = [ { - host = 23; - container = 8023; + host = pubSshPort; + container = intSshPort; } ]; svc.autoStart = true; @@ -38,7 +41,8 @@ in ROOT_URL = "https://git.floweytf.com/"; START_SSH_SERVER = true; BUILTIN_SSH_SERVER_USER = "git"; - SSH_PORT = 8023; + SSH_PORT = pubSshPort; + SSH_LISTEN_PORT = intSshPort; }; service.DISABLE_REGISTRATION = true; }; From 73187bcc9b56d3c7b14b51639b7fe28fcd0b21a4 Mon Sep 17 00:00:00 2001 From: Floweynt <50057682+Floweynt@users.noreply.github.com> Date: Wed, 9 Sep 2026 22:12:37 -0500 Subject: [PATCH 02/18] test something --- containers/server-n0/git.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/containers/server-n0/git.nix b/containers/server-n0/git.nix index 41a5e74..12d253a 100644 --- a/containers/server-n0/git.nix +++ b/containers/server-n0/git.nix @@ -146,6 +146,8 @@ in }; # nix.optimise.automatic = true; - doesn't work with microvm.writableStoreOverlay + services.journald.extraConfig = "ForwardToConsole=yes"; + virtualisation.docker.enable = true; systemd.services.load-ci-job-image = { From 8d61167757a5d0ea191db73981cd953e28d2bc42 Mon Sep 17 00:00:00 2001 From: Floweynt <50057682+Floweynt@users.noreply.github.com> Date: Wed, 9 Sep 2026 22:22:17 -0500 Subject: [PATCH 03/18] try fixing gitea ci --- containers/server-n0/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/server-n0/git.nix b/containers/server-n0/git.nix index 12d253a..d2ec837 100644 --- a/containers/server-n0/git.nix +++ b/containers/server-n0/git.nix @@ -84,7 +84,7 @@ in proto = "virtiofs"; tag = "runner-state"; source = "${ciRunnerData}/runner-state"; - mountPoint = "/var/lib/gitea-runner"; + mountPoint = "/var/lib/private/gitea-runner"; } { proto = "virtiofs"; From ed244dd9f3504b1480bf2bfaf249ea8e532d0cda Mon Sep 17 00:00:00 2001 From: Floweynt <50057682+Floweynt@users.noreply.github.com> Date: Wed, 9 Sep 2026 22:37:36 -0500 Subject: [PATCH 04/18] try fixing gitea ci: v2 --- dsl.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dsl.nix b/dsl.nix index ab4be0e..871e4ef 100644 --- a/dsl.nix +++ b/dsl.nix @@ -553,10 +553,10 @@ rec { Destination = "0.0.0.0/0"; Gateway = hostAddr; }; + networkConfig.DNS = [ hostAddr ]; linkConfig.RequiredForOnline = if allowInternet then "routable" else "degraded"; }; networking.enableIPv6 = false; - networking.nameservers = [ hostAddr ]; }; }; }); From 6e4c303ade72fec930309fad3e70aa136efc2aaa Mon Sep 17 00:00:00 2001 From: Floweynt <50057682+Floweynt@users.noreply.github.com> Date: Wed, 9 Sep 2026 23:10:34 -0500 Subject: [PATCH 05/18] try fixing gitea ci: v3 --- dsl.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dsl.nix b/dsl.nix index 871e4ef..8266855 100644 --- a/dsl.nix +++ b/dsl.nix @@ -554,9 +554,11 @@ rec { Gateway = hostAddr; }; networkConfig.DNS = [ hostAddr ]; + networkConfig.Domains = [ "~." "containers" ]; linkConfig.RequiredForOnline = if allowInternet then "routable" else "degraded"; }; networking.enableIPv6 = false; + networking.nameservers = [ hostAddr ]; }; }; }); From 780bdb7c1312463820a44a61480c17ff5dedc573 Mon Sep 17 00:00:00 2001 From: Floweynt <50057682+Floweynt@users.noreply.github.com> Date: Wed, 9 Sep 2026 23:19:28 -0500 Subject: [PATCH 06/18] try fixing gitea ci: v4 --- containers/server-n0/git.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/containers/server-n0/git.nix b/containers/server-n0/git.nix index d2ec837..208c684 100644 --- a/containers/server-n0/git.nix +++ b/containers/server-n0/git.nix @@ -107,6 +107,7 @@ in ciJobImage = pkgs.dockerTools.buildLayeredImage { name = "ci-job-image"; tag = "latest"; + maxLayers = 50; contents = with pkgs; [ bashInteractive coreutils From 15cae9a40dd98c2a467500c02406d20b8369efd4 Mon Sep 17 00:00:00 2001 From: Floweynt <50057682+Floweynt@users.noreply.github.com> Date: Wed, 9 Sep 2026 23:48:01 -0500 Subject: [PATCH 07/18] try fixing gitea ci: v5 --- containers/server-n0/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/server-n0/git.nix b/containers/server-n0/git.nix index 208c684..540eb81 100644 --- a/containers/server-n0/git.nix +++ b/containers/server-n0/git.nix @@ -107,7 +107,6 @@ in ciJobImage = pkgs.dockerTools.buildLayeredImage { name = "ci-job-image"; tag = "latest"; - maxLayers = 50; contents = with pkgs; [ bashInteractive coreutils @@ -150,6 +149,7 @@ in services.journald.extraConfig = "ForwardToConsole=yes"; virtualisation.docker.enable = true; + virtualisation.docker.daemon.settings.storage-opts = [ "overlay2.userxattr=true" ]; systemd.services.load-ci-job-image = { description = "Load the CI job Docker image"; From 83a84fd0f404b25ec68262ade3789228d9d67383 Mon Sep 17 00:00:00 2001 From: Floweynt <50057682+Floweynt@users.noreply.github.com> Date: Thu, 10 Sep 2026 08:57:25 -0500 Subject: [PATCH 08/18] try fixing gitea ci: v6 --- containers/server-n0/git.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/containers/server-n0/git.nix b/containers/server-n0/git.nix index 540eb81..54b524b 100644 --- a/containers/server-n0/git.nix +++ b/containers/server-n0/git.nix @@ -148,8 +148,13 @@ in services.journald.extraConfig = "ForwardToConsole=yes"; + virtualisation.containerd.enable = true; + virtualisation.containerd.settings.plugins."io.containerd.snapshotter.v1.overlayfs".mount_options = [ "userxattr" ]; + virtualisation.docker.enable = true; - virtualisation.docker.daemon.settings.storage-opts = [ "overlay2.userxattr=true" ]; + virtualisation.docker.extraOptions = "--containerd /run/containerd/containerd.sock"; + systemd.services.docker.wants = [ "containerd.service" ]; + systemd.services.docker.after = [ "containerd.service" ]; systemd.services.load-ci-job-image = { description = "Load the CI job Docker image"; From 7df803484d6c074f4a13f6c8a71f2d9617660541 Mon Sep 17 00:00:00 2001 From: Floweynt <50057682+Floweynt@users.noreply.github.com> Date: Thu, 10 Sep 2026 09:21:05 -0500 Subject: [PATCH 09/18] try fixing gitea ci: v7 --- containers/server-n0/git.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/containers/server-n0/git.nix b/containers/server-n0/git.nix index 54b524b..d403b67 100644 --- a/containers/server-n0/git.nix +++ b/containers/server-n0/git.nix @@ -118,6 +118,7 @@ in config = { Cmd = [ "/bin/sh" ]; Env = [ + "PATH=/bin" "SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" "NIX_SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" "NIX_REMOTE=daemon" From ea4fa7c55c7e98047032ee14f8f215cf3ec04267 Mon Sep 17 00:00:00 2001 From: Floweynt <50057682+Floweynt@users.noreply.github.com> Date: Thu, 10 Sep 2026 09:33:51 -0500 Subject: [PATCH 10/18] try fixing gitea ci: v8 --- containers/server-n0/git.nix | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/containers/server-n0/git.nix b/containers/server-n0/git.nix index d403b67..1e68282 100644 --- a/containers/server-n0/git.nix +++ b/containers/server-n0/git.nix @@ -104,17 +104,19 @@ in let runnerInstanceName = "ci-runner"; + ciJobContents = with pkgs; [ + bashInteractive + coreutils + gitMinimal + nixVersions.latest + nodejs + cacert + ]; + ciJobImage = pkgs.dockerTools.buildLayeredImage { name = "ci-job-image"; tag = "latest"; - contents = with pkgs; [ - bashInteractive - coreutils - gitMinimal - nixVersions.latest - nodejs - cacert - ]; + contents = ciJobContents; config = { Cmd = [ "/bin/sh" ]; Env = [ @@ -130,6 +132,10 @@ in boot.kernelModules = [ "kvm-intel" ]; boot.extraModprobeConfig = "options kvm_intel nested=1"; + # volume-mounted into CI containers; must be in VM's store so + # image symlinks (/bin/node etc.) resolve through the mount + system.extraDependencies = ciJobContents; + microvm.writableStoreOverlay = "/nix/.rw-store"; nix.settings = { From 0d08a1a521085d1d229be99c1b7d5de772e18d22 Mon Sep 17 00:00:00 2001 From: Floweynt <50057682+Floweynt@users.noreply.github.com> Date: Thu, 10 Sep 2026 09:47:48 -0500 Subject: [PATCH 11/18] try fixing gitea ci: v9 --- containers/server-n0/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/server-n0/git.nix b/containers/server-n0/git.nix index 1e68282..207f7a4 100644 --- a/containers/server-n0/git.nix +++ b/containers/server-n0/git.nix @@ -120,7 +120,7 @@ in config = { Cmd = [ "/bin/sh" ]; Env = [ - "PATH=/bin" + "PATH=${lib.makeBinPath ciJobContents}" "SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" "NIX_SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" "NIX_REMOTE=daemon" From b62ecdd957bd9fdb057634f14d9c9a81dc7ac0ab Mon Sep 17 00:00:00 2001 From: Floweynt <50057682+Floweynt@users.noreply.github.com> Date: Thu, 10 Sep 2026 10:00:15 -0500 Subject: [PATCH 12/18] try fixing gitea ci: v10 --- .github/workflows/diff-pr.yml | 5 ----- .github/workflows/diff-tag.yml | 5 ----- .github/workflows/flake-check.yml | 5 ----- .github/workflows/flake-update.yml | 5 ----- .github/workflows/lint.yml | 5 ----- .github/workflows/vulnix.yml | 5 ----- 6 files changed, 30 deletions(-) diff --git a/.github/workflows/diff-pr.yml b/.github/workflows/diff-pr.yml index e20624a..4dd6bf9 100644 --- a/.github/workflows/diff-pr.yml +++ b/.github/workflows/diff-pr.yml @@ -19,11 +19,6 @@ jobs: with: fetch-depth: 0 - - uses: cachix/install-nix-action@v31 - with: - extra_nix_config: | - experimental-features = nix-command flakes - - name: worktree base for diff run: git worktree add "$RUNNER_TEMP/base" "${{ github.event.pull_request.base.sha }}" diff --git a/.github/workflows/diff-tag.yml b/.github/workflows/diff-tag.yml index 6e6e778..d3bb30d 100644 --- a/.github/workflows/diff-tag.yml +++ b/.github/workflows/diff-tag.yml @@ -15,11 +15,6 @@ jobs: with: fetch-depth: 0 - - uses: cachix/install-nix-action@v31 - with: - extra_nix_config: | - experimental-features = nix-command flakes - - name: diff latest tag against HEAD run: | tag=$(git tag --sort=-creatordate | head -n1) diff --git a/.github/workflows/flake-check.yml b/.github/workflows/flake-check.yml index 220af69..9e6642d 100644 --- a/.github/workflows/flake-check.yml +++ b/.github/workflows/flake-check.yml @@ -18,9 +18,4 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@v31 - with: - extra_nix_config: | - experimental-features = nix-command flakes - - run: nix flake check -L diff --git a/.github/workflows/flake-update.yml b/.github/workflows/flake-update.yml index 700c672..3a475dd 100644 --- a/.github/workflows/flake-update.yml +++ b/.github/workflows/flake-update.yml @@ -15,11 +15,6 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@v31 - with: - extra_nix_config: | - experimental-features = nix-command flakes - - run: nix flake update - name: open/update PR diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9dfacbc..41517aa 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -19,11 +19,6 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@v31 - with: - extra_nix_config: | - experimental-features = nix-command flakes - - name: pick reporter run: | if [ "${{ github.event_name }}" = pull_request ]; then diff --git a/.github/workflows/vulnix.yml b/.github/workflows/vulnix.yml index 85fa661..220bc1c 100644 --- a/.github/workflows/vulnix.yml +++ b/.github/workflows/vulnix.yml @@ -15,11 +15,6 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@v31 - with: - extra_nix_config: | - experimental-features = nix-command flakes - - name: scan host closures id: scan run: echo "count=$(nix run .#ci -- vulnix . "$RUNNER_TEMP/issue.md")" >> "$GITHUB_OUTPUT" From fded1cd2333c54c7cbe520bf5df7ee79a4ae6a37 Mon Sep 17 00:00:00 2001 From: Floweynt <50057682+Floweynt@users.noreply.github.com> Date: Thu, 10 Sep 2026 10:06:23 -0500 Subject: [PATCH 13/18] try fixing gitea ci: v11 --- containers/server-n0/git.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/containers/server-n0/git.nix b/containers/server-n0/git.nix index 207f7a4..fe6a7d3 100644 --- a/containers/server-n0/git.nix +++ b/containers/server-n0/git.nix @@ -124,6 +124,7 @@ in "SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" "NIX_SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" "NIX_REMOTE=daemon" + "NIX_CONFIG=experimental-features = nix-command flakes" ]; }; }; From 7f3068f51c2a5ba70355663013a5b8ab2532e1ce Mon Sep 17 00:00:00 2001 From: Floweynt <50057682+Floweynt@users.noreply.github.com> Date: Thu, 10 Sep 2026 10:09:33 -0500 Subject: [PATCH 14/18] try fixing gitea ci: v12 --- containers/server-n0/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/server-n0/git.nix b/containers/server-n0/git.nix index fe6a7d3..7810d2e 100644 --- a/containers/server-n0/git.nix +++ b/containers/server-n0/git.nix @@ -111,6 +111,7 @@ in nixVersions.latest nodejs cacert + (writeTextDir "etc/nix/nix.conf" "experimental-features = nix-command flakes\n") ]; ciJobImage = pkgs.dockerTools.buildLayeredImage { @@ -124,7 +125,6 @@ in "SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" "NIX_SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" "NIX_REMOTE=daemon" - "NIX_CONFIG=experimental-features = nix-command flakes" ]; }; }; From b8d64efc11de69fa129b5673a3c59f021b3b78fa Mon Sep 17 00:00:00 2001 From: Floweynt <50057682+Floweynt@users.noreply.github.com> Date: Thu, 10 Sep 2026 10:28:40 -0500 Subject: [PATCH 15/18] try fixing gitea ci: v13 --- containers/server-n0/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/server-n0/git.nix b/containers/server-n0/git.nix index 7810d2e..7b52f86 100644 --- a/containers/server-n0/git.nix +++ b/containers/server-n0/git.nix @@ -66,7 +66,7 @@ in ]; svc.autoStart = true; resources.cpu = 4; - resources.mem = "8G"; + resources.mem = "16G"; resources.fs = [ { proto = "virtiofs"; From df615ba3c162d4f8f05f8505482b3e0291abe4e4 Mon Sep 17 00:00:00 2001 From: Floweynt <50057682+Floweynt@users.noreply.github.com> Date: Thu, 10 Sep 2026 11:13:26 -0500 Subject: [PATCH 16/18] try fixing gitea ci: v14 --- .github/workflows/diff-pr.yml | 6 +++--- .github/workflows/diff-tag.yml | 4 ++-- .github/workflows/flake-update.yml | 4 ++-- .github/workflows/lint.yml | 4 ++-- .github/workflows/vulnix.yml | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/diff-pr.yml b/.github/workflows/diff-pr.yml index 4dd6bf9..17b0abf 100644 --- a/.github/workflows/diff-pr.yml +++ b/.github/workflows/diff-pr.yml @@ -24,10 +24,10 @@ jobs: - name: build closures and render diff run: | - nix run .#ci -- diff "$RUNNER_TEMP/base" . \ + nix run -L .#ci -- diff "$RUNNER_TEMP/base" . \ "### System closure diff vs \`${{ github.event.pull_request.base.ref }}\`" \ > "$RUNNER_TEMP/comment.md" - nix run .#ci -- inspect-diff "$RUNNER_TEMP/base" . \ + nix run -L .#ci -- inspect-diff "$RUNNER_TEMP/base" . \ "### Inspection diff vs \`${{ github.event.pull_request.base.ref }}\`" \ >> "$RUNNER_TEMP/comment.md" @@ -37,4 +37,4 @@ jobs: API: ${{ github.api_url }} REPO: ${{ github.repository }} PR: ${{ github.event.pull_request.number }} - run: nix run .#ci -- post-comment "" "$RUNNER_TEMP/comment.md" + run: nix run -L .#ci -- post-comment "" "$RUNNER_TEMP/comment.md" diff --git a/.github/workflows/diff-tag.yml b/.github/workflows/diff-tag.yml index d3bb30d..381814d 100644 --- a/.github/workflows/diff-tag.yml +++ b/.github/workflows/diff-tag.yml @@ -25,8 +25,8 @@ jobs: git worktree add "$RUNNER_TEMP/old" "$tag" head=$(git rev-parse --short HEAD) { - nix run .#ci -- diff "$RUNNER_TEMP/old" . \ + nix run -L .#ci -- diff "$RUNNER_TEMP/old" . \ "# System closure diff: \`$tag\` -> \`$head\`" - nix run .#ci -- inspect-diff "$RUNNER_TEMP/old" . \ + nix run -L .#ci -- inspect-diff "$RUNNER_TEMP/old" . \ "# Inspection diff: \`$tag\` -> \`$head\`" } | tee -a "$GITHUB_STEP_SUMMARY" diff --git a/.github/workflows/flake-update.yml b/.github/workflows/flake-update.yml index 3a475dd..27ec96d 100644 --- a/.github/workflows/flake-update.yml +++ b/.github/workflows/flake-update.yml @@ -15,7 +15,7 @@ jobs: steps: - uses: actions/checkout@v4 - - run: nix flake update + - run: nix flake update -L - name: open/update PR env: @@ -24,5 +24,5 @@ jobs: REPO: ${{ github.repository }} run: | printf 'Automated `nix flake update`.\n' > "$RUNNER_TEMP/body.md" - nix run .#ci -- open-pr \ + nix run -L .#ci -- open-pr \ flake-update "$GITHUB_REF_NAME" "flake.lock: update inputs" "$RUNNER_TEMP/body.md" automated diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 41517aa..bb0b54c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -28,9 +28,9 @@ jobs: fi - name: run linters - run: nix run .#ci -- lint . "$RUNNER_TEMP/findings" + run: nix run -L .#ci -- lint . "$RUNNER_TEMP/findings" - name: report findings env: REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: nix run .#ci -- lint-report "$REPORTER" "$RUNNER_TEMP/findings" + run: nix run -L .#ci -- lint-report "$REPORTER" "$RUNNER_TEMP/findings" diff --git a/.github/workflows/vulnix.yml b/.github/workflows/vulnix.yml index 220bc1c..13a5440 100644 --- a/.github/workflows/vulnix.yml +++ b/.github/workflows/vulnix.yml @@ -17,7 +17,7 @@ jobs: - name: scan host closures id: scan - run: echo "count=$(nix run .#ci -- vulnix . "$RUNNER_TEMP/issue.md")" >> "$GITHUB_OUTPUT" + run: echo "count=$(nix run -L .#ci -- vulnix . "$RUNNER_TEMP/issue.md")" >> "$GITHUB_OUTPUT" - name: file/update issue if: steps.scan.outputs.count != '0' @@ -25,7 +25,7 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} API: ${{ github.api_url }} REPO: ${{ github.repository }} - run: nix run .#ci -- upsert-issue vulnix "vulnix: known vulnerabilities in system closure" "$RUNNER_TEMP/issue.md" + run: nix run -L .#ci -- upsert-issue vulnix "vulnix: known vulnerabilities in system closure" "$RUNNER_TEMP/issue.md" - name: close resolved issue if: steps.scan.outputs.count == '0' @@ -33,4 +33,4 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} API: ${{ github.api_url }} REPO: ${{ github.repository }} - run: nix run .#ci -- close-issue vulnix + run: nix run -L .#ci -- close-issue vulnix From 8c20c5850d9c77a3c24d33cff4a2da7f0c888f62 Mon Sep 17 00:00:00 2001 From: Floweynt <50057682+Floweynt@users.noreply.github.com> Date: Thu, 10 Sep 2026 11:18:31 -0500 Subject: [PATCH 17/18] try fixing gitea ci: v14 --- ci.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci.py b/ci.py index e4a3d57..56512ac 100644 --- a/ci.py +++ b/ci.py @@ -17,7 +17,7 @@ def run(*args, **kw): def nix(*args): - return run("nix", "--extra-experimental-features", "nix-command flakes", *args, check=True, capture_output=True).stdout + return run("nix", "--extra-experimental-features", "nix-command flakes", "-L", *args, check=True, stdout=subprocess.PIPE).stdout def git(*args, check=True): From 3e5e4cfc1da66598d72542f89e51477cd3611597 Mon Sep 17 00:00:00 2001 From: Floweynt <50057682+Floweynt@users.noreply.github.com> Date: Thu, 10 Sep 2026 11:29:01 -0500 Subject: [PATCH 18/18] try fixing gitea ci: v15 --- containers/server-n0/git.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/containers/server-n0/git.nix b/containers/server-n0/git.nix index 7b52f86..b09a7c4 100644 --- a/containers/server-n0/git.nix +++ b/containers/server-n0/git.nix @@ -57,6 +57,7 @@ in ci-runner = mkVm { name = "ci-runner"; + includedInTests = false; net.access = [ { to = "git"; @@ -66,7 +67,7 @@ in ]; svc.autoStart = true; resources.cpu = 4; - resources.mem = "16G"; + resources.mem = "32G"; resources.fs = [ { proto = "virtiofs";