Merge pull request #1690 from cpcloud/aarch64-darwin

nix-community · Jun 9, 2024 · 7f3af42 · 7f3af42
2 parents 98c9f1d + 9404c40
commit 7f3af42
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -50,7 +50,8 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - macos-latest
+          - macos-13
+          - macos-14
     steps:
       - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v27
@@ -72,7 +73,8 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - macos-latest
+          - macos-13
+          - macos-14
     steps:
       - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v27
@@ -89,7 +91,8 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - macos-latest
+          - macos-13
+          - macos-14
     steps:
       - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v27

diff --git a/flake.nix b/flake.nix
@@ -44,6 +44,11 @@
             };
         in
         nix-github-actions.lib.mkGithubMatrix {
+          platforms = {
+            "x86_64-linux" = "ubuntu-22.04";
+            "x86_64-darwin" = "macos-13";
+            "aarch64-darwin" = "macos-14";
+          };
           checks = {
             x86_64-linux =
               let
@@ -60,6 +65,19 @@
                 inherit (pkgs) lib;
                 tests = import ./tests { inherit pkgs; };
               in
+              {
+                # Aggregate all tests into one derivation so that only one GHA runner is scheduled for all darwin jobs
+                aggregate = pkgs.runCommand "darwin-aggregate"
+                  {
+                    env.TEST_INPUTS = lib.concatStringsSep " " (lib.attrValues (lib.filterAttrs (_: v: lib.isDerivation v) tests));
+                  } "touch $out";
+              };
+            aarch64-darwin =
+              let
+                pkgs = mkPkgs "aarch64-darwin";
+                inherit (pkgs) lib;
+                tests = import ./tests { inherit pkgs; };
+              in
               {
                 # Aggregate all tests into one derivation so that only one GHA runner is scheduled for all darwin jobs
                 aggregate =