From 563d6f296e993584f69dd3b74f9837fb460dca87 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Mon, 19 Jun 2023 22:18:53 +0200 Subject: [PATCH] Configured binary cache for Hercules CI --- hosts/default.nix | 2 ++ modules/hercules-ci/default.nix | 5 ++--- secrets/default.nix | 1 + secrets/hercules-ci-binary-caches.age | Bin 2090 -> 2097 bytes 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hosts/default.nix b/hosts/default.nix index 2d2d877..fe7f0c8 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -187,6 +187,7 @@ secrets = { "rock5b-wireguard-private-key" = {}; "hercules-ci-join-token".owner = "hercules-ci-agent"; + "hercules-ci-binary-caches".owner = "hercules-ci-agent"; }; colmena.deployment.buildOnTarget = true; }; @@ -232,6 +233,7 @@ # "hydra-github-token".group = "hydra"; "cache-private-key".owner = "nix-serve"; "hercules-ci-join-token".owner = "hercules-ci-agent"; + "hercules-ci-binary-caches".owner = "hercules-ci-agent"; }; }; }; diff --git a/modules/hercules-ci/default.nix b/modules/hercules-ci/default.nix index 10beff5..86b786c 100644 --- a/modules/hercules-ci/default.nix +++ b/modules/hercules-ci/default.nix @@ -8,9 +8,8 @@ settings = { concurrentTasks = 8; clusterJoinTokenPath = config.age.secrets.hercules-ci-join-token.path; - # Don't need using private caches, if I would ever need remember to use agenix! - binaryCachesPath = pkgs.writeText "binary-caches-path" (builtins.toJSON {}); - # secretsJsonPath = config.hci-secrets.hci-mlabs-haskell.target; + binaryCachesPath = config.age.secrets.hercules-ci-binary-caches.path; + # secretsJsonPath = config.hercules-ci-secrets.path; }; }; } diff --git a/secrets/default.nix b/secrets/default.nix index f44fd85..0622a3f 100644 --- a/secrets/default.nix +++ b/secrets/default.nix @@ -11,6 +11,7 @@ in "cache-private-key.age".publicKeys = [ccr-ssh ccr-gpg mothership]; "autistici-password.age".publicKeys = [ccr-ssh ccr-gpg thinkpad]; "hercules-ci-join-token.age".publicKeys = [ccr-ssh ccr-gpg mothership rock5b]; + "hercules-ci-binary-caches.age".publicKeys = [ccr-ssh ccr-gpg mothership rock5b]; # WireGuard "thinkpad-wireguard-private-key.age".publicKeys = [ccr-ssh ccr-gpg thinkpad]; diff --git a/secrets/hercules-ci-binary-caches.age b/secrets/hercules-ci-binary-caches.age index 288053b7ec97eecd08b317b04d9bf89cbd1ad64b..03278e8b2b961863fb3418f4bae23795786d60a8 100644 GIT binary patch literal 2097 zcmZ9N{qNia9mkCeAY~aF33Cp%3_?J;eC_qx>-BJo?e*cV?cMd^dcErpX6?1T>+|FF zdd-Fr9l8i3Qyj*JAS5s{<7ONh9}+||F+Rma7UxJnB*skR6f;zulKJHa6XRd-O5U&c z`}5J~)`k_%(si6WQTYBSor47gYaq;*esrmOj~He@Dbiu$?Y`b)-3%YKj;QdkGjxw;;P1Y)6xV^34a}6 z>v04k6*gF{<%XW-P2YfmrDqG4i9r#%7V412&wPi>0p1B0U??wKk`9ewqfScAuE_hU z(Cd+HKO+%o)c`$b*~yr(H-vDvBf<(*<8V zuD}kl2whlh86_>!jmk*eEG6>^2U_zc>nIY&H2}?R`+;jKg&#mArPAJL(rP5~jID>7 zJ8l?CL^fwLZqBSXeJ<5`3lnU9n2H%f%%(A}@%8YQZp_A%eh^h&bGm zW-xrLjj>b~YpaAqV@>oBDjz%M$iaM0Q^XnoDJUB^GN(<%CMdY80_h!oKe|s!;Qy9bnGG2IIKO6)ILn}qAMCqV`j`KAmkByp9gTkS`5}9tCM!dFk z_>*WlVgUu5OcuJhZUk9RDxlQF%~5kR4JuxG2^;%rCL`fkNr)Z?7dmH* za@<_xNk1-T^h7ty5#Xvl1p|@Q)EE|Cp^z}m_WU7VPkJ)m@5E(hLfEpZDI24l{_cXeFbtQIs^N{#P>8f_NQ8k)Z4L| zHJkCgPJrnECvw2A1`BbM6LdzsJm@)|YxXirMLbCz__oDnkOwPuk4Y1xF9mIX0F&lu zR!;nsf#s&s1u{D#OCo8e^T?;;y3`)n5~+3KUXBr1qG?90yCe#bY;nm#!USu!G`;#P zL#EnzI_OprU=RvJE{Kkc>m3_5i9DU)=m@fwN`E=*;hbGi@d(3;1RJ0u*KjtqQaq22 zXB?N;L9hu_;A#kakx3105pHZAB)Y>)gH_EePy**cMhehS9WH#zFjGcd2&^Nvpx#8+ zN}5qaZvjXu7EzoPjwRoY42Tkh(yf+lV$qEk6k>~lTxnCQN%3X1v|Fuw7*bwe&O##W z+lc@LK+`e0U>tfr)xt!{N<^obp%rMxpwf-tz%Hse+Hbp%Hxa`^tS>Qi<<&?sCV8r! z&p94Qz!qx{+$Di&=G2hjF{+r2t^#IkI3EsGnI2la*QwDghWxk3mf2`Fq4vI{rU)Uv zj~Mhuxfy#UY_R5dHW1}?FZB3EtG(*jJzglu&Dp~?MiUf(ppyaYP04W6B$4QrQjM@~ zuMaI6qo`ssu35wm%db(lrRWGaa zh3*uHl8i)PD6K)z(;$7|B@9eyyxK~#%+4toVWzZ6(M4%M`cmOs?`>MbZp>3l&#Zm7 z-Mb&WX9-lE9xm`Kq+2~;V`F2Vy0X^@#3pJD&ghZ1k9pC@PYwx@8iv8>j_pp0{>AuzyE!@EQ1Z`_x;v zo(ZC~0RjAN}JWj{Gir^XY|*U9+X1 z-Tlfpzx@m4nSbqg=Z$ASbK<(>9{JJjon60r?7(X;!=FVzfAlNASMPj^ZLdH0>iP@) zgMZt$xA)a-$KE>*{N0ut;M1& literal 2090 zcmZ9MTgc=F8HN|EMT4kCXw_=>XItyV>~AtTPQa?kWOA6vBs0n6xP_8rCWpx+nIw}; zl67s>i&dez9_os{s9v}i>K3HdUbI%E>O!%L)Y8_%Ld#lhl`Vp$Sdqow3qibmZ@w3v z@8NZV)!{1jigvq;vh)*K5rB0cIQ-N>S%!y2=^TKR6VQ8L!PQ9;&4#^6;EJ;yYEB9y zc4iqvuVf#mvAwhedkv{6NM|JCbhA_&f!&H>Id@~T?9G7~WS}@U=L54rXZxN3@=#x4 z>B8N>X%qDb6d@uzMe?;bhFhfPnwGxD25v{w%PNA@2q0lKNwy8Wjq9C?6SyNR*f16B zQsEdslcgs2Nh}U_e9P#FoZ#BHON+gQ`;09YeuM(XDzu?QQ)-tbC>(`JwT%*+tyk*W zF$tm&OtF%NOEqQ|@&Z?EYk)Ue6zLU`$bB=Yfo>K$u!eC|f%n^~G2Z^(GTpja zZn@UXT6pNvoD$Bs+|%rqSEk`wRMcHnbEroFqfxz_&Ad6{$J5vgqTMQwB^=6BR+K7t z-h!&Qx3@9NrFmv72IA5PysezhYf<*S`HTRdGPf7ul9-1GZzKWE_a=jAX5nBMdn0Zp z??h+1H3}$RS0!YXnbo94Uzn?@367#9#sIc1p}>ZFqx~n)H%6C z^J&FQ=)jZ-LK8-*DiVu?c5B;X0fI^>7hdtSXxrJ4KKj6W`m1T=knD; zLnKcO%H=-SfRJBci98tvG!;n$C;>CY@!Hz$m<*rA?m9@8F6YwrfX23Po7LM$pI2HN z%9uD&<_HZ4YP6oUdxqz8$`NL(Nu*ERd}4P!a#J?MbQb1br#WeoX1ZTRQ*)}LLll8< zzFF*9EeDKp4v%B02)R;V#>^&8_nN)sIz&eU%nK)K8*G$88yqEd!})UBEbOvjvUED$ z)U&t&{JyB6j-muHu@C6lV${*vNFaPz^`?W#4)iiws8g@yjm!r}R!1isw&^CKqx-Qk zu0TM;b!d}n1=i9U<@;OOMPV6T+e|wI!BMQ44L0VH)CxjtW1DlNBE-bYy}F0b*{XKO z058{*kXRu&yX|ucY1eIx2)WCK)rOQTkaHT}ODa9xIKy#RSEF4%>N;=Ca1Goj5w`?T z#oi@5R9#>m5-)hY@9+lACeAjWELeI)t*5%|gxgXN2v{0!o$oIpR;--i+P-i(=Pi=V2(Gf4U#JKa&Ax}6^09TGabU~a#BqfGjiw8z;1fdvWGQEqtgVz3=kYQyd!R7L)p8vK>lkbK zfx1Eklc4^;t!hDYGCu(GVhVfCmN49*0bGf(4wYU!iVB!pT zK^cT3yzio5N{euk>(LzY_#^A(RZlijuZl1gD$xJ5?KCfdZ*LESV&#;p12G4N5R3ad z>36gsF9a>B+8n7fJ~c!=HLAQtM?T*(<>h==hYBbgODRRL*%7G2!-M6~nME+o9T>v; z8*!2bK@V0!cDK$%w4>2DtD~(sHyEe{o@0OZ%Rk=n=lbUBAOGZEZg}^l3r`9Ue)E-k zvX|NQyU*?ZnP|Ml_9#@p|~?>_VRZ>~M{&&zMcKaqq#tr{4GU?{7W*tbhOD zw+}sY?6#ZEaZl`@zVqshuitl{LI3!t7ykPC1A+hcuOIp#bkpWb$ImhkU%&p?v)BG{ z_RjOWQy0H~;vK=M<4=6_!u99xc)z#l_RTj?9ysy*$rqAiFR^bn@e3EMZ$B!X8NPAbzXALQ B;?Mv9