try to upgrade hercules

This commit is contained in:
Jörg Thalheim 2021-12-24 08:09:40 +01:00
parent 6b8924f2a1
commit 8fb62a6084
2 changed files with 15 additions and 1 deletions
nix
roles/hercules-ci

View file

@ -11,6 +11,18 @@
"url": "https://github.com/cachix/cachix/archive/f5cd1b44c2b3dffd6cc31c56a35c55a8775acf75.tar.gz", "url": "https://github.com/cachix/cachix/archive/f5cd1b44c2b3dffd6cc31c56a35c55a8775acf75.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"hercules-ci-agent": {
"branch": "master",
"description": "https://hercules-ci.com build and deployment agent",
"homepage": "",
"owner": "hercules-ci",
"repo": "hercules-ci-agent",
"rev": "81ad6448f41367c8ec89ee541df54419b24f4c53",
"sha256": "1l5jj3plhykcibfad7296j8d9bjjk6hp8ds6684077lp86dbbzgp",
"type": "tarball",
"url": "https://github.com/hercules-ci/hercules-ci-agent/archive/81ad6448f41367c8ec89ee541df54419b24f4c53.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"hercules-ci-effects": { "hercules-ci-effects": {
"branch": "add-cachix-deploy", "branch": "add-cachix-deploy",
"description": "Expressions to change the world", "description": "Expressions to change the world",

View file

@ -1,4 +1,4 @@
{ config, ... }: { config, pkgs, ... }:
let let
herculesSecret = { herculesSecret = {
@ -6,6 +6,7 @@ let
sopsFile = ./secrets.yaml; sopsFile = ./secrets.yaml;
}; };
secrets = config.sops.secrets; secrets = config.sops.secrets;
hercules = import (import ../../nix/sources.nix {}).hercules-ci-agent;
in in
{ {
sops.secrets."binary-caches.json" = herculesSecret; sops.secrets."binary-caches.json" = herculesSecret;
@ -14,6 +15,7 @@ in
services.hercules-ci-agent = { services.hercules-ci-agent = {
enable = true; enable = true;
package = hercules.packages.${pkgs.system}.hercules-ci-agent-nix_2_4;
settings = { settings = {
binaryCachesPath = secrets."binary-caches.json".path; binaryCachesPath = secrets."binary-caches.json".path;
secretsJsonPath = secrets."hercules-secrets".path; secretsJsonPath = secrets."hercules-secrets".path;