Skip to content

Commit

Permalink
switch back to nixpkgs hercules ci agent
Browse files Browse the repository at this point in the history
  • Loading branch information
zowoq committed Feb 12, 2024
1 parent 10bde5b commit 6a41da9
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 74 deletions.
67 changes: 6 additions & 61 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@

treefmt-nix.url = "github:numtide/treefmt-nix";
treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";

hercules-ci-agent.url = "github:hercules-ci/hercules-ci-agent";
hercules-ci-agent.inputs.flake-parts.follows = "flake-parts";
#hercules-ci-agent.inputs.nixpkgs.follows = "nixpkgs";
};

outputs = inputs @ { flake-parts, self, ... }:
Expand Down
5 changes: 0 additions & 5 deletions hosts/darwin02/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@
inputs.self.darwinModules.remote-builder
];

# can be removed when we switch back to the nixpkgs hercules-ci-agent
system.systemBuilderArgs.sandboxProfile = ''
(allow file-read* file-write* process-exec mach-lookup (subpath "${builtins.storeDir}"))
'';

nix.settings.sandbox = "relaxed";
nix.settings.extra-platforms = [ "x86_64-darwin" ];

Expand Down
2 changes: 0 additions & 2 deletions modules/darwin/hercules-ci/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{ inputs, pkgs, ... }:
{
# hercules secrets are installed manually from ./secrets.yaml
# https://docs.hercules-ci.com/hercules-ci/getting-started/deploy/nix-darwin
services.hercules-ci-agent.enable = true;
services.hercules-ci-agent.package = inputs.hercules-ci-agent.packages.${pkgs.stdenv.hostPlatform.system}.hercules-ci-agent;
}
3 changes: 1 addition & 2 deletions modules/nixos/hercules-ci/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ config, inputs, pkgs, ... }:
{ config, ... }:
let
herculesSecret = {
owner = "hercules-ci-agent";
Expand All @@ -13,7 +13,6 @@ in

services.hercules-ci-agent = {
enable = true;
package = inputs.hercules-ci-agent.packages.${pkgs.stdenv.hostPlatform.system}.hercules-ci-agent;
settings = {
binaryCachesPath = secrets."binary-caches.json".path;
clusterJoinTokenPath = secrets."cluster-join-token.key".path;
Expand Down

0 comments on commit 6a41da9

Please sign in to comment.