Revert "switch back to post-build-hook"
This reverts commit 94de107c30
.
watch-store seems to be working again with cachix 1.6
This commit is contained in:
parent
1b22419687
commit
4dada30f83
2 changed files with 2 additions and 19 deletions
|
@ -15,6 +15,7 @@
|
||||||
inputs.self.nixosModules.common
|
inputs.self.nixosModules.common
|
||||||
inputs.self.nixosModules.hercules-ci
|
inputs.self.nixosModules.hercules-ci
|
||||||
inputs.self.nixosModules.raid
|
inputs.self.nixosModules.raid
|
||||||
|
inputs.self.nixosModules.watch-store
|
||||||
inputs.self.nixosModules.zfs
|
inputs.self.nixosModules.zfs
|
||||||
inputs.self.nixosModules.remote-builder-build04
|
inputs.self.nixosModules.remote-builder-build04
|
||||||
inputs.self.nixosModules.remote-builder-darwin02
|
inputs.self.nixosModules.remote-builder-darwin02
|
||||||
|
|
|
@ -1,20 +1,4 @@
|
||||||
{ lib, inputs, pkgs, config, ... }:
|
{ lib, pkgs, config, ... }:
|
||||||
let
|
|
||||||
upload-to-cachix = pkgs.writeScriptBin "upload-to-cachix" ''
|
|
||||||
#!/bin/sh
|
|
||||||
set -eu
|
|
||||||
set -f # disable globbing
|
|
||||||
|
|
||||||
# skip push if the declarative job spec
|
|
||||||
OUT_END=$(echo ''${OUT_PATHS: -10})
|
|
||||||
if [ "$OUT_END" == "-spec.json" ]; then
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
export HOME=/root
|
|
||||||
exec ${pkgs.cachix}/bin/cachix -c ${config.sops.secrets.nix-community-cachix.path} push nix-community $OUT_PATHS > /tmp/hydra_cachix 2>&1
|
|
||||||
'';
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
options.services.hydra = {
|
options.services.hydra = {
|
||||||
adminPasswordFile = lib.mkOption {
|
adminPasswordFile = lib.mkOption {
|
||||||
|
@ -43,9 +27,7 @@ in
|
||||||
"https://github.com/nix-community/"
|
"https://github.com/nix-community/"
|
||||||
"https://github.com/NixOS/"
|
"https://github.com/NixOS/"
|
||||||
];
|
];
|
||||||
nix.settings.post-build-hook = "${upload-to-cachix}/bin/upload-to-cachix";
|
|
||||||
|
|
||||||
sops.secrets.nix-community-cachix.sopsFile = "${toString inputs.self}/modules/nixos/nix-community-cache/secrets.yaml";
|
|
||||||
sops.secrets.id_buildfarm = { };
|
sops.secrets.id_buildfarm = { };
|
||||||
|
|
||||||
# delete build logs older than 30 days
|
# delete build logs older than 30 days
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue