feat(ci): scoped rebuilds

DaRacci · DaRacci · commit bd2aabeb8855 · 2025-05-17T22:42:52.000+10:00
All hosts imports are dynamically gotten and compared against the changed files to know if they actually need building or not.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -12,6 +12,126 @@ on:
         type: string
 
 jobs:
+  determine-affected:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+      all-hosts: ${{ steps.set-matrix.outputs.all-hosts }}
+      build-all: ${{ steps.set-matrix.outputs.build-all }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.branch }}
+          fetch-depth: 0
+
+      - uses: ./.github/actions/setup-nix
+        with:
+          arch: x86_64-linux
+          TS_OAUTH_CLIENT_ID: ${{ secrets.TS_OAUTH_CLIENT_ID }}
+          TS_OAUTH_SECRET: ${{ secrets.TS_OAUTH_SECRET }}
+          ATTIC_ENDPOINT: ${{ secrets.ATTIC_ENDPOINT }}
+          ATTIC_CACHE: ${{ secrets.ATTIC_CACHE }}
+          ATTIC_TOKEN: ${{ secrets.ATTIC_TOKEN }}
+
+      - name: Get hosts from flake
+        id: get-hosts
+        run: |
+          ALL_HOSTS=$(nix flake show --impure --json | jq -r '.nixosConfigurations | keys | .[]' | jq -R . | jq -s .)
+          echo "All hosts from flake: $ALL_HOSTS"
+          echo "all-hosts=$ALL_HOSTS" >> "$GITHUB_OUTPUT"
+
+          # Special Properties
+          NO_BUILD=()
+          EXTRA_SPACE=("nixmi" "winix")
+
+          deviceTypes=$(find hosts -maxdepth 1 -type d -name '*' | grep -oP 'hosts/\K[^/]+' | grep -v shared)
+          echo "host-types=$(echo "$deviceTypes" | jq -R . | jq -s .)" >> "$GITHUB_OUTPUT"
+
+          users_imports="{}"
+          declare -a host_entries
+          for host in $(echo "$ALL_HOSTS" | jq -r '.[]'); do
+            noBuild=false
+            if [[ " ${NO_BUILD[*]} " = *" $host "* ]]; then
+              noBuild=true
+            fi
+            extraSpace=false
+            if [[ " ${EXTRA_SPACE[*]} " = *" $host "* ]]; then
+              extraSpace=true
+            fi
+
+            hostType="unknown"
+            for deviceType in $deviceTypes; do
+              if [ -d "hosts/$deviceType/$host" ]; then
+                hostType="$deviceType"
+                break
+              fi
+            done
+
+            imports=$(./utils/get-imports.nu "OS" "$host" | jq -c .)
+            users=$(nix eval --impure --json .#nixosConfigurations.nixmi.config.home-manager.users --apply builtins.attrNames | jq -c .)
+            for user in $(echo "$users" | jq -r '.[]'); do
+              if [[ "$(echo "$users_imports" | jq -r ".$user == null")" == "true" ]]; then
+                users_imports=$(echo "$users_imports" | jq \
+                  --arg username "$user" \
+                  --argjson user "$(./utils/get-imports.nu "HOME" "$user" | jq -c .)" \
+                  '.[$username] = $user')
+              fi
+
+              imports=$(jq -s '.[0] + .[1]' <(echo "$imports") <(echo "$users_imports" | jq -c ".$user"))
+            done
+
+            entry=$(jq -n \
+              --arg host "$host" \
+              --arg system "x86_64-linux" \
+              --arg hostType "$hostType" \
+              --argjson users "$users" \
+              --argjson imports "$imports" \
+              --argjson extraSpace "$extraSpace" \
+              --argjson noBuild "$noBuild" \
+              '{host: $host, system: $system, hostType: $hostType, users: $users, imports: $imports, extraSpace: $extraSpace, noBuild: $noBuild}')
+
+            host_entries+=("$entry")
+          done
+
+          HOST_DETAILS=$(jq -s 'map({key: .host, value: .}) | from_entries' <<<"${host_entries[@]}")
+          echo "Host details: $HOST_DETAILS"
+          echo "host-details=$HOST_DETAILS" >> "$GITHUB_OUTPUT"
+
+      - name: Determine affected hosts
+        id: set-matrix
+        run: |
+          CHANGED_FILES=$(git diff --name-only ${{ github.event.before }} ${{ github.sha }} | grep -v '^D' || true)
+          echo "Changed files:"
+          echo "$CHANGED_FILES"
+
+          HOST_DETAILS=$(echo "${{steps.get-hosts.outputs.host-details}}" | jq -c .)
+
+          declare -a build_hosts
+          if echo "$CHANGED_FILES" | grep -qE '(^flake\.nix$|^flake\.lock$|^lib/|^overlays/|^pkgs/)'; then
+            echo "Found changes in core files. All hosts will be rebuilt."
+            build_hosts=("$(echo "$HOST_DETAILS" | jq -r 'keys[]')")
+          else
+            rebuild_json=$(jq --argjson changed "$(jq -R -s -c . <<<"$CHANGED_FILES")" '
+              . as $hosts |
+              to_entries
+              | map(select(.value.imports |
+                  any( . as $imp | ($changed | index($imp)) )))
+              | map(.key)
+            ' <<<"$HOST_DETAILS")
+
+            mapfile -t build_hosts < <(jq -r '.[]' <<<"$rebuild_json")
+          fi
+
+          declare -a matrix_entries
+          for host in "${build_hosts[@]}"; do
+            entry=$(echo "$HOST_DETAILS" | jq -r ".$host")
+            matrix_entries+=("$entry")
+          done
+
+          MATRIX_JSON="$(printf '%s\n' "${matrix_entries[@]}" | jq -s .)"
+          echo "matrix=$MATRIX_JSON" >> "$GITHUB_OUTPUT"
+
   checks:
     runs-on: ubuntu-latest
     steps:
@@ -24,34 +144,16 @@ jobs:
         uses: DeterminateSystems/flake-checker-action@main
 
   build:
+    needs: determine-affected
+    if: needs.determine-affected.outputs.matrix != '[]'
     runs-on: ubuntu-latest
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.host }}-${{ matrix.system }}
       cancel-in-progress: true
     strategy:
       fail-fast: false
-      # TODO - Use a step to determine the hosts dynamically from the flake
       matrix:
-        include:
-          - host: nixmi
-            system: x86_64-linux
-            extraSpace: true
-          - host: winix
-            system: x86_64-linux
-          - host: nixai
-            system: x86_64-linux
-          - host: nixarr
-            system: x86_64-linux
-          - host: nixcloud
-            system: x86_64-linux
-          - host: nixdev
-            system: x86_64-linux
-          - host: nixio
-            system: x86_64-linux
-          - host: nixmon
-            system: x86_64-linux
-          - host: nixserv
-            system: x86_64-linux
+        include: ${{ fromJSON(needs.determine-affected.outputs.matrix) }}
 
     name: ${{ matrix.host }} on ${{ matrix.system }}
 
@@ -62,16 +164,18 @@ jobs:
           ref: ${{ inputs.branch }}
 
       - name: Free Disk Space
-        if: ${{ matrix.extraSpace == true && !env.ACT }}
+        if: ${{ matrix.extraSpace && !env.ACT }}
         uses: jlumbroso/free-disk-space@main
         with:
           swap-storage: true
           tool-cache: true
+
       - name: Create Dir for Mounting more Disk Space ❄
-        if: ${{ matrix.extraSpace == true && !env.ACT }}
+        if: ${{ matrix.extraSpace && !env.ACT }}
         run: sudo mkdir /nix
+
       - name: Maximize Disk Space
-        if: ${{ matrix.extraSpace == true && !env.ACT }}
+        if: ${{ matrix.extraSpace && !env.ACT }}
         uses: easimon/maximize-build-space@v10
         with:
           build-mount-path: /nix
@@ -83,8 +187,9 @@ jobs:
           temp-reserve-mb: 100
           swap-size-mb: 4096
           root-reserve-mb: 1024
+
       - name: Ensure correct permissions for /nix
-        if: ${{ matrix.extraSpace == true && !env.ACT }}
+        if: ${{ matrix.extraSpace && !env.ACT }}
         run: sudo chown -R root:root /nix
 
       - uses: ./.github/actions/setup-nix
@@ -102,7 +207,7 @@ jobs:
         run: nix eval --impure --accept-flake-config .#nixosConfigurations.${{ matrix.host }}.config.system.build.toplevel
 
       - name: Build ${{ matrix.host }}
-        # if: matrix.noBuild != true
+        if: ${{ !matrix.noBuild }}
         env:
           _system: ${{ matrix.system }}
         run: nix build --impure --accept-flake-config .#nixosConfigurations.${{ matrix.host }}.config.system.build.toplevel
diff --git a/flake.nix b/flake.nix
@@ -161,7 +161,7 @@
                   };
                 };
 
-            users = lib.genAttrs [ "racci" ] (name: builders.home.mkHomeManager system name { });
+            users = lib.genAttrs [ "racci" "root" ] (name: builders.home.mkHomeManager system name { });
           in
           {
             nixosConfigurations = builtins.mapAttrs (_n: v: v.system) configurations;
diff --git a/lib/builders/home/userConf.nix b/lib/builders/home/userConf.nix
@@ -1,4 +1,5 @@
 {
+  flake,
   lib,
   name,
   userDirectory,
@@ -12,6 +13,7 @@
     homeDirectory = lib.mkDefault "/home/${name}";
 
     sessionPath = [ "$HOME/.local/bin" ];
+    stateVersion = "25.05";
   };
 
   sops = lib.mkIf (user != null) {
@@ -21,6 +23,7 @@
 
   imports =
     [
+      "${flake}/home/shared/global"
       "${userDirectory}/global.nix"
     ]
     ++ (
diff --git a/lib/builders/system/mkRaw.nix b/lib/builders/system/mkRaw.nix
@@ -38,7 +38,6 @@ rec {
           home-manager = {
             useUserPackages = true;
             useGlobalPkgs = true;
-            sharedModules = [ "${flake}/home/shared/global" ];
           };
 
           system.stateVersion = "25.05";
diff --git a/utils/get-hm-imports.nix b/utils/get-hm-imports.nix
@@ -0,0 +1,37 @@
+home:
+let
+  inherit (home) pkgs;
+  inherit (pkgs) lib;
+
+  # Doing this to silence the warning about collectModules being an internal function
+  inherit
+    (
+      (import (home.options._module.specialArgs.value.inputs.nixpkgs + "/lib/modules.nix") {
+        lib = lib.extend (
+          _: prev: {
+            trivial = prev.trivial // {
+              warn = _: y: y;
+            };
+          }
+        );
+      })
+    )
+    collectModules
+    ;
+in
+lib.pipe
+  (collectModules ./. home.options._module.args.value.moduleType.getSubModules (
+    {
+      inherit (home) options;
+      lib = lib.extend (_: _: { hm = home.options.lib.value; });
+      specialArgs = home.options._module.specialArgs.value;
+      config = home.config // {
+        inherit (home.options) _module;
+      };
+    }
+    // home.options._module.specialArgs.value
+  ))
+  [
+    (lib.map (lib.getAttr "_file"))
+    lib.unique
+  ]
diff --git a/utils/get-imports.nu b/utils/get-imports.nu
@@ -0,0 +1,24 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i nu -p nushell nix jq
+
+def main [
+  type: string,
+  system: string
+] {
+  let thisSource = nix flake archive --json | jq -r '.path'
+
+  let all_imports = if $type == "OS" {
+      nix eval --impure --json $".#nixosConfigurations.($system)" --apply $"(cat ./utils/get-os-imports.nix)" | from json
+  } else if $type == "HOME" {
+      nix eval --impure --json $".#homeConfigurations.($system)" --apply $"(cat ./utils/get-hm-imports.nix)" | from json
+  } else {
+      echo "Invalid type. Use 'OS' or 'HOME'."
+      return
+  }
+
+  let our_imports = $all_imports
+    | filter { $in | str starts-with $thisSource }
+    | each { $in | str substring (($thisSource | str length) + 1)..  }
+
+  echo $our_imports | to json
+}
diff --git a/utils/get-os-imports.nix b/utils/get-os-imports.nix
@@ -0,0 +1,35 @@
+system:
+let
+  inherit (system) lib;
+
+  # Doing this to silence the warning about collectModules being an internal function
+  inherit
+    (
+      (import (system._module.specialArgs.flake.inputs.nixpkgs + "/lib/modules.nix") {
+        lib = lib.extend (
+          _: prev: {
+            trivial = prev.trivial // {
+              warn = _: y: y;
+            };
+          }
+        );
+      })
+    )
+    collectModules
+    ;
+in
+lib.pipe
+  (collectModules ./. system.type.getSubModules (
+    {
+      inherit (system) lib options;
+      inherit (system._module) specialArgs;
+      config = system.config // {
+        inherit (system) _module;
+      };
+    }
+    // system._module.specialArgs
+  ))
+  [
+    (lib.map (lib.getAttr "_file"))
+    lib.unique
+  ]

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@`
`161`	`161`	`};`
`162`	`162`	`};`
`163`	`163`
`164`		`- users = lib.genAttrs [ "racci" ] (name: builders.home.mkHomeManager system name { });`
	`164`	`+ users = lib.genAttrs [ "racci" "root" ] (name: builders.home.mkHomeManager system name { });`
`165`	`165`	`in`
`166`	`166`	`{`
`167`	`167`	`nixosConfigurations = builtins.mapAttrs (_n: v: v.system) configurations;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ flake,`
`2`	`3`	`lib,`
`3`	`4`	`name,`
`4`	`5`	`userDirectory,`
`@@ -12,6 +13,7 @@`
`12`	`13`	`homeDirectory = lib.mkDefault "/home/${name}";`
`13`	`14`
`14`	`15`	`sessionPath = [ "$HOME/.local/bin" ];`
	`16`	`+ stateVersion = "25.05";`
`15`	`17`	`};`
`16`	`18`
`17`	`19`	`sops = lib.mkIf (user != null) {`
`@@ -21,6 +23,7 @@`
`21`	`23`
`22`	`24`	`imports =`
`23`	`25`	`[`
	`26`	`+ "${flake}/home/shared/global"`
`24`	`27`	`"${userDirectory}/global.nix"`
`25`	`28`	`]`
`26`	`29`	`++ (`