kiara/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

allow accessing the attic cache from the CI runner

Browse source
This commit is contained in:
Kiara Grouwstra 2025-07-05 21:47:35 +02:00
parent 5282bb1b7e
commit 65b909cf5b
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
2 changed files with 29 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
machines/dev/forgejo-ci/forgejo-actions-runner.nix
View file

@ -2,15 +2,19 @@
lib, lib,
pkgs, pkgs,
config, config,
sources,
... ...
}: }:
let
sources = import ../../../npins;
user = "gitea-runner";
hm_strings = import "${sources.home-manager}/modules/lib/strings.nix" { inherit lib; };
in
{ {
_class = "nixos"; _class = "nixos";
imports = with sources; [ imports = with sources; [
(import "${home-manager}/nixos") "${home-manager}/nixos"
"${vars}/options.nix" "${vars}/options.nix"
"${vars}/backends/on-machine.nix" "${vars}/backends/on-machine.nix"
]; ];
@ -58,6 +62,13 @@
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
vars.settings.on-machine.enable = true; vars.settings.on-machine.enable = true;
vars.generators."attic" = {
runtimeInputs = [ pkgs.coreutils ];
files."token".secret = true;
script = ''
cp "${config.age.secrets.attic-ci-token.path}" "$out/${"token"}"
'';
};
vars.generators."templates" = rec { vars.generators."templates" = rec {
dependencies = [ "attic" ]; dependencies = [ "attic" ];
runtimeInputs = [ runtimeInputs = [
@ -68,12 +79,15 @@
lib.mapAttrsToList (template: _: '' lib.mapAttrsToList (template: _: ''
cp "$templates/${template}" "$out/${template}" cp "$templates/${template}" "$out/${template}"
echo "filling placeholders in template ${template}..." echo "filling placeholders in template ${template}..."
sed -i "s/${placeholder}/$(cat "${config.age.secrets.wiki-password.path}")/g" "$out/${template}" sed -i "s/${config.vars.generators."attic".files."token".placeholder}/$(cat "${
config.vars.generators."attic".files."token".path
}")/g" "$out/${template}"
'') files '') files
); );
files."attic.toml" = { files."attic.toml" = {
secret = true; secret = true;
owner = user;
template = pkgs.writeText "attic.toml" '' template = pkgs.writeText "attic.toml" ''
default-server = "fediversity" default-server = "fediversity"
@ -84,11 +98,18 @@
}; };
}; };
# needed to place a config file with home-manager
users.users.${user}.isNormalUser = true;
home-manager = { home-manager = {
users.gitea-runner.home = { users.${user}.home = {
stateVersion = "25.05"; stateVersion = "25.05";
file.".config/attic/config.toml".source = file.".config/attic/config.toml".source =
config.vars.generators."templates".files."attic.toml".path; let
pathStr = config.vars.generators."templates".files."attic.toml".path;
name = hm_strings.storeFileName (baseNameOf pathStr);
in
pkgs.runCommandLocal name { } ''ln -s ${lib.escapeShellArg pathStr} $out'';
}; };
}; };
} }

6
npins/sources.json
View file

@ -160,9 +160,9 @@
}, },
"branch": "templates", "branch": "templates",
"submodules": false, "submodules": false,
"revision": "6ff942bf2b514edaa1022a92edb6552ac32a09d1", "revision": "2f2ebd96b5df4c0f01509d6b283e15d8516a1c7b",
"url": "https://github.com/kiaragrouwstra/vars/archive/6ff942bf2b514edaa1022a92edb6552ac32a09d1.tar.gz", "url": "https://github.com/kiaragrouwstra/vars/archive/2f2ebd96b5df4c0f01509d6b283e15d8516a1c7b.tar.gz",
"hash": "1h1q3l1l1c1j4ak5lcj2yh85jwqww74ildiak2dkd4h1js9v6cvw" "hash": "0rpxh85fizmmh7v2qvhp9jzrvcyv1yhl58zd1dk0hx33s77da84x"
} }
}, },
"version": 5 "version": 5