Merge pull request #241 from nix-community/fix-fix-fix-cachix

fix cachix

Author: Mic92

buildbot_nix/models.py

@@ -69,7 +69,7 @@ def environment(self) -> Mapping[str, str | Interpolate]:
         return environment
 
     class Config:
-        fields = exclude_fields(["singing_key", "auth_token"])
+        fields = exclude_fields(["signing_key", "auth_token"])
 
 
 class GiteaConfig(BaseModel):

examples/master.nix

@@ -62,10 +62,11 @@
 
     # optional cachix
     #cachix = {
+    #  enabled = true;
     #  name = "my-cachix";
     #  # One of the following is required:
-    #  signingKeyFile = "/var/lib/secrets/cachix-key";
-    #  authTokenFile = "/var/lib/secrets/cachix-token";
+    #  auth.signingKey.file = "/var/lib/secrets/cachix-key";
+    #  auth.authToken.file = "/var/lib/secrets/cachix-token";
     #};
   };
 

nix/checks/master.nix

@@ -23,6 +23,11 @@
             oauthSecretFile = pkgs.writeText "oauthSecret" "ffffffffffffffffffffffffffffffffffffffff";
             oauthId = "aaaaaaaaaaaaaaaaaaaa";
           };
+          cachix = {
+            enable = true;
+            name = "my-cachix";
+            auth.authToken.file = pkgs.writeText "cachixAuthToken" "00000000000000000000";
+          };
         };
       };
   };
@@ -31,5 +36,6 @@
     start_all()
     # wait for our service to start
     node1.wait_for_unit("buildbot-master")
+    node1.wait_until_succeeds("curl --fail -s --head localhost:8010", timeout=60)
   '';
 }