From a45043e622fc1b8fbfb84151c59fc539ac2fd6b6 Mon Sep 17 00:00:00 2001 From: hannes Date: Fri, 6 Sep 2024 06:52:04 +0200 Subject: [PATCH] fixed forgejo ci-runner --- hosts/forgejo-ci/default.nix | 5 +++-- services/forgejo-ci.nix | 7 +++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hosts/forgejo-ci/default.nix b/hosts/forgejo-ci/default.nix index a0727aa..bd0caf8 100644 --- a/hosts/forgejo-ci/default.nix +++ b/hosts/forgejo-ci/default.nix @@ -7,7 +7,7 @@ ./../../meta/profiles/base.nix ./../../meta/profiles/vm.nix ]; - lyn.sops.secrets."hosts/frottjo-ci-runner/forgejo_ci-token".owner = "gitea-runner"; + lyn.sops.secrets."hosts/forgejo-ci/forgejo_ci_token" = {}; # Use UEFI boot.loader.systemd-boot.enable = true; @@ -16,4 +16,5 @@ # Firewall stuff: networking.firewall.enable = true; networking.firewall.allowPing = true; -} \ No newline at end of file + system.stateVersion = "23.05"; +} diff --git a/services/forgejo-ci.nix b/services/forgejo-ci.nix index 6294b1d..5a06c1e 100644 --- a/services/forgejo-ci.nix +++ b/services/forgejo-ci.nix @@ -2,8 +2,6 @@ { environment.systemPackages = with pkgs; [ docker - forgejo-actions-runner - ]; # Enable docker @@ -16,14 +14,15 @@ }; # Forgejo actions runner services.gitea-actions-runner = { + package = config.pkgsInstances.unstable.forgejo-runner; instances = { "shibepro-ci" = { enable = true; url = "https://git.shibe.pro"; name = "shibepro-ci"; - tokenFile = config.sops.secrets."hosts/forgejo-ci/forgejo_ci-token".path; + tokenFile = config.sops.secrets."hosts/forgejo-ci/forgejo_ci_token".path; labels = []; }; }; }; -} \ No newline at end of file +}