From 2c191da16d19d25278a8aa352f9e54be63681615 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Fri, 23 Feb 2024 14:03:53 -0500 Subject: [PATCH] Migrate ema to gh runner on macos --- flake.lock | 6 +++--- flake.nix | 2 +- systems/darwin/ci.nix | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index b9a7934b..b35b047d 100644 --- a/flake.lock +++ b/flake.lock @@ -1066,11 +1066,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1708707468, - "narHash": "sha256-taJutlFoIf3j7bdsmi2LnBVK++vb9tQ/QuZ2Y88uXQY=", + "lastModified": 1708714761, + "narHash": "sha256-Uh6FEKpjhv3fr7t8qbrq+EeyeSe3Qa+URcUbuKFvCfg=", "owner": "srid", "repo": "nixci", - "rev": "86a7888e0d3a790afb7bc452cc8fda3ef5efd86c", + "rev": "ca54fda15db5fc73592928e529e8aef0907b42c9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 99abbfae..010ba497 100644 --- a/flake.nix +++ b/flake.nix @@ -86,7 +86,7 @@ sops.defaultSopsFormat = "json"; services.tailscale.enable = true; services.easy-github-runners = { - "srid/ema" = { }; + # TODO: move to macOS runner, after figuring how to run tests (in Nix?) "srid/haskell-flake" = { }; }; }; diff --git a/systems/darwin/ci.nix b/systems/darwin/ci.nix index 0ed726bf..31910e3c 100644 --- a/systems/darwin/ci.nix +++ b/systems/darwin/ci.nix @@ -23,6 +23,10 @@ url = "https://github.com/srid/emanote"; num = 2; }; + ema = { + url = "https://github.com/srid/ema"; + num = 2; + }; nixos-config = { url = "https://github.com/srid/nixos-config"; num = 2;