From 46c8cd44dd05a94d35625ac594fd90802b4c1d85 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 27 Oct 2023 13:43:31 +1000
Subject: [PATCH] darwin03: convert to community builder
---
docs/community-builder.md | 12 ++++++++++--
hosts/darwin03/configuration.nix | 3 +--
modules/nixos/remote-workers.nix | 9 ---------
terraform/cloudflare_nix-community_org.tf | 7 +++++++
4 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/docs/community-builder.md b/docs/community-builder.md
index ce0b34d..642c56a 100644
--- a/docs/community-builder.md
+++ b/docs/community-builder.md
@@ -1,12 +1,20 @@
-We provide an `x86_64-linux` machine as a public remote builder for the nix community.
+We provide machines as public builders for the nix community.
+
+`x86_64-linux`
```
build-box.nix-community.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIElIQ54qAy7Dh63rBudYKdbzJHrrbrrMXLYl7Pkmk88H
```
+`aarch64-darwin`, `x86_64-darwin`
+
+```
+darwin-build-box.nix-community.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKX7W1ztzAtVXT+NBMITU+JLXcIE5HTEOd7Q3fQNu80S
+```
+
#### Access
-If you want access read the security guide lines on [aarch64-build-box](https://github.com/nix-community/aarch64-build-box). Than add your username to [`builder/users.nix`](https://github.com/nix-community/infra/blob/master/modules/nixos/community-builder/users.nix). Don't keep any important data in your home! We will regularly delete `/home` without further notice.
+If you want access read the security guide lines on [aarch64-build-box](https://github.com/nix-community/aarch64-build-box). Than add your username to [`nixos/community-builder/users.nix`](https://github.com/nix-community/infra/blob/master/modules/nixos/community-builder/users.nix) or [`darwin/community-builder/users.nix`](https://github.com/nix-community/infra/blob/master/modules/darwin/community-builder/users.nix) Don't keep any important data in your home! We will regularly delete `/home` without further notice.
#### Using your NixOS home-manager configuration on the hosts
diff --git a/hosts/darwin03/configuration.nix b/hosts/darwin03/configuration.nix
index d303b67..56e6914 100644
--- a/hosts/darwin03/configuration.nix
+++ b/hosts/darwin03/configuration.nix
@@ -4,8 +4,7 @@
imports = [
inputs.self.darwinModules.common
inputs.self.darwinModules.builder
- inputs.self.darwinModules.hercules-ci
- inputs.self.darwinModules.remote-builder
+ inputs.self.darwinModules.community-builder
];
nix.settings.sandbox = "relaxed";
diff --git a/modules/nixos/remote-workers.nix b/modules/nixos/remote-workers.nix
index 147d6ec..fe099e5 100644
--- a/modules/nixos/remote-workers.nix
+++ b/modules/nixos/remote-workers.nix
@@ -23,14 +23,5 @@
systems = [ "aarch64-darwin" "x86_64-darwin" ];
supportedFeatures = [ "big-parallel" ];
}
- {
- hostName = "darwin03.nix-community.org";
- maxJobs = 8;
- protocol = "ssh";
- sshKey = config.sops.secrets.id_buildfarm.path;
- sshUser = "nix";
- systems = [ "aarch64-darwin" "x86_64-darwin" ];
- supportedFeatures = [ "big-parallel" ];
- }
];
}
diff --git a/terraform/cloudflare_nix-community_org.tf b/terraform/cloudflare_nix-community_org.tf
index 481b85a..1658601 100644
--- a/terraform/cloudflare_nix-community_org.tf
+++ b/terraform/cloudflare_nix-community_org.tf
@@ -159,6 +159,13 @@ resource "cloudflare_record" "nix-community-org-build-box-CNAME" {
type = "CNAME"
}
+resource "cloudflare_record" "nix-community-org-darwin-build-box-CNAME" {
+ zone_id = local.nix_community_zone_id
+ name = "darwin-build-box"
+ value = "darwin03.nix-community.org"
+ type = "CNAME"
+}
+
resource "cloudflare_record" "nix-community-org-buildbot-CNAME" {
zone_id = local.nix_community_zone_id
name = "buildbot"