Merge pull request #107 from holochain/ci-nix-eval

feat(ci/pr): build OS configurations
holochain · Jun 14, 2024 · 00824c4 · 00824c4
2 parents 76734c2 + 73bf83a
commit 00824c4
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 39 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -1,19 +1,27 @@
+name: Build
+
 on:
   pull_request:
   push:
     branches: [develop]
 
+
 jobs:
-  lints:
-    name: Build
-    runs-on: ubuntu-22.04
+  os:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, macos-13]
+    name: OS
+    runs-on: ${{ matrix.os }}
     permissions:
       id-token: "write"
       contents: "read"
     steps:
-    - uses: actions/checkout@v4
-    - uses: DeterminateSystems/nix-installer-action@main
-    - uses: DeterminateSystems/magic-nix-cache-action@main
-    - uses: DeterminateSystems/flake-checker-action@main
-    # - name: Run `nix build`
-    #   run: nix build .
+      - uses: actions/checkout@v4
+      - uses: DeterminateSystems/nix-installer-action@v12
+      - uses: DeterminateSystems/magic-nix-cache-action@v7
+      - uses: DeterminateSystems/flake-checker-action@v8
+      - run: |
+          nix build .#build-os-configurations
+          ls -lha result/
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -4,7 +4,8 @@
   inputs = {
     nixpkgs.follows = "nixpkgs-23-11";
     nixpkgs-23-11 = {url = "github:nixos/nixpkgs/nixos-23.11";};
-    nixpkgsNix = {url = "github:nixos/nixpkgs/nixos-unstable";};
+    nixpkgs-24-05 = {url = "github:nixos/nixpkgs/nixos-24.05";};
+    nixpkgsNix.follows = "nixpkgs-24-05";
     nixpkgsGithubActionRunners = {url = "github:nixos/nixpkgs/nixos-unstable";};
     nixpkgsUnstable = {url = "github:nixos/nixpkgs/nixos-unstable";};
     nixpkgsMaster = {url = "github:nixos/nixpkgs/master";};
@@ -135,6 +136,7 @@
         inputs',
         pkgs,
         lib,
+        system,
         ...
       }: {
         # Per-system attributes can be defined here. The self' and inputs'
@@ -221,11 +223,49 @@
             '';
           };
 
-        packages = {
-          nomad = inputs'.nixpkgs.legacyPackages.nomad_1_6;
-
-          nixos-anywhere = inputs'.nixos-anywhere.packages.default;
-        };
+        packages =
+          {
+            # nomad = pkgs.nomad_1_6;
+
+            nixos-anywhere = inputs'.nixos-anywhere.packages.default;
+          }
+          // (
+            let
+              mkOsConfigCheck = osConfigs: let
+                filteredBySystem =
+                  lib.filterAttrs (
+                    key: value:
+                      (value.pkgs.system == system)
+                      # needs private repos
+                      && (key != "tfgrid-hpos")
+                  )
+                  osConfigs;
+                asStrings =
+                  lib.mapAttrsToList (
+                    key: value:
+                      builtins.trace "evaluating ${key} (${value.pkgs.system})..."
+                      "ln -s ${value.config.system.build.toplevel} $out/${key}"
+                  )
+                  filteredBySystem;
+              in
+                pkgs.stdenv.mkDerivation {
+                  name = "check-osconfigurations";
+                  phases = "installPhase";
+                  installPhase = "mkdir $out;" + builtins.concatStringsSep "\n" asStrings;
+                };
+            in {
+              build-os-configurations =
+                if pkgs.stdenv.isLinux
+                then
+                  mkOsConfigCheck (builtins.removeAttrs self.nixosConfigurations [
+                    # too big for current CI structure and rarely used
+                    "vm-nixcache"
+                  ])
+                else if pkgs.stdenv.isDarwin
+                then mkOsConfigCheck self.darwinConfigurations
+                else throw "unexpected case";
+            }
+          );
       };
       flake = {
         # The usual flake attributes can be defined here, including system-

diff --git a/modules/nixos/kitsune-bootstrap.nix b/modules/nixos/kitsune-bootstrap.nix
@@ -11,7 +11,7 @@ in {
     enable = lib.mkEnableOption "kitsune-bootstrap";
 
     package = lib.mkOption {
-      default = self.inputs.holochain.packages.${pkgs.system}.holochain;
+      default = self.inputs.holochain.packages.${pkgs.system}.holochain.override {cargoExtraArgs = " --bin kitsune-bootstrap";};
       type = lib.types.package;
     };
 

diff --git a/modules/nixos/shared.nix b/modules/nixos/shared.nix
@@ -17,7 +17,7 @@
     # ]
     ;
 
-  nix.package = lib.mkDefault inputs.nixpkgsNix.legacyPackages.${pkgs.stdenv.system}.nixVersions.nix_2_20;
+  nix.package = lib.mkDefault inputs.nixpkgsNix.legacyPackages.${pkgs.stdenv.system}.nixVersions.nix_2_21;
 
   nix.settings.extra-platforms =
     lib.mkIf pkgs.stdenv.isDarwin ["x86_64-darwin" "aarch64-darwin"];