From 785b65271c84935d32a3da46e62c62b815995a6b Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 18 Jul 2023 06:48:41 +1000
Subject: [PATCH] disable darwin
---
dev/effect.nix | 30 ------------------------------
flake.nix | 1 +
2 files changed, 1 insertion(+), 30 deletions(-)
diff --git a/dev/effect.nix b/dev/effect.nix
index 2dcc8b0..0efcf90 100644
--- a/dev/effect.nix
+++ b/dev/effect.nix
@@ -3,42 +3,12 @@
herculesCI = { config, ... }:
withSystem "x86_64-linux" ({ hci-effects, pkgs, self', ... }:
let
- # using the drv path here avoids downloading the closure on the deploying machine
- darwin02 = builtins.unsafeDiscardStringContext self.darwinConfigurations.darwin02.config.system.build.toplevel.drvPath;
- darwin03 = builtins.unsafeDiscardStringContext self.darwinConfigurations.darwin03.config.system.build.toplevel.drvPath;
-
inherit (config.repo) ref;
inherit (hci-effects) mkEffect runIf;
inherit (pkgs.lib) hasPrefix;
in
{
onPush.default.outputs.effects = {
- darwin-deploy = runIf (hasPrefix "refs/heads/gh-readonly-queue/master/" ref)
- (mkEffect {
- name = "darwin-deploy";
- secretsMap.hercules-ssh = "hercules-ssh";
- effectScript = ''
- writeSSHKey hercules-ssh
- cat >>~/.ssh/known_hosts <<EOF
- darwin02.nix-community.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICJqwpMUEl1/iwrBakeDb1rlheXlE5mfDLICVz8w6yi6
- darwin03.nix-community.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKX7W1ztzAtVXT+NBMITU+JLXcIE5HTEOd7Q3fQNu80S
- EOF
- ${hci-effects.ssh { destination = "hetzner@darwin02.nix-community.org"; } ''
- set -eux
- newProfile=$(nix-store --realise ${darwin02})
- sudo -H nix-env --profile /nix/var/nix/profiles/system --set $newProfile
- $newProfile/sw/bin/darwin-rebuild activate
- set +x
- ''}
- ${hci-effects.ssh { destination = "hetzner@darwin03.nix-community.org"; } ''
- set -eux
- newProfile=$(nix-store --realise ${darwin03})
- sudo -H nix-env --profile /nix/var/nix/profiles/system --set $newProfile
- $newProfile/sw/bin/darwin-rebuild activate
- set +x
- ''}
- '';
- });
terraform-deploy = runIf (hasPrefix "refs/heads/gh-readonly-queue/master/" ref)
(mkEffect {
name = "terraform-deploy";
diff --git a/flake.nix b/flake.nix
index 0520426..9b94f7d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -52,6 +52,7 @@
systems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
herculesCI = { lib, ... }: {
+ ciSystems = [ "x86_64-linux" "aarch64-linux" ];
onPush.default.outputs = {
checks = lib.mkForce self.outputs.checks.x86_64-linux;
packages = lib.mkForce self.outputs.packages.x86_64-linux;