From d8aa1551652ef28832fe50bf5d932e4a253d8d50 Mon Sep 17 00:00:00 2001 From: Truxnell <19149206+truxnell@users.noreply.github.com> Date: Tue, 26 Mar 2024 23:11:49 +1100 Subject: [PATCH] feat: add diff ci (#18) --- .github/workflows/diff-pr.yaml | 10 ++++------ flake.nix | 13 +++++++++++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.github/workflows/diff-pr.yaml b/.github/workflows/diff-pr.yaml index 6874af0..52cbc26 100644 --- a/.github/workflows/diff-pr.yaml +++ b/.github/workflows/diff-pr.yaml @@ -18,13 +18,11 @@ jobs: matrix: include: - os: ubuntu-latest - target: pride + target: citadel - os: ubuntu-latest - target: sloth + target: rickenbacker - os: ubuntu-latest - target: eden - - os: ubuntu-latest - target: wrath + target: dns01 steps: - name: Create nix mount point @@ -54,7 +52,7 @@ jobs: with: extra_nix_config: | experimental-features = nix-command flakes - access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + - uses: cachix/cachix-action@v14 with: diff --git a/flake.nix b/flake.nix index ad4fa8d..5274eef 100644 --- a/flake.nix +++ b/flake.nix @@ -163,6 +163,19 @@ # deploy-rs: This is highly advised, and will prevent many possible mistakes checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib; + + # Convenience output that aggregates the outputs for home, nixos, and darwin configurations. + # Also used in ci to build targets generally. + top = + let + nixtop = nixpkgs.lib.genAttrs + (builtins.attrNames inputs.self.nixosConfigurations) + (attr: inputs.self.nixosConfigurations.${attr}.config.system.build.toplevel); + # hometop = genAttrs + # (builtins.attrNames inputs.self.homeManagerConfigurations) + # (attr: inputs.self.homeManagerConfigurations.${attr}.activationPackage); + in + nixtop; # // hometop }; }