Compare commits
	
		
			1 Commits
		
	
	
		
			01897ef0bb
			...
			731cfce080
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 731cfce080 | 
@@ -6,7 +6,7 @@ on:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
  check:
 | 
					  check:
 | 
				
			||||||
    name: Check Nix flake
 | 
					    name: Check, build and cache Nix flake
 | 
				
			||||||
    runs-on: ubuntu-22.04
 | 
					    runs-on: ubuntu-22.04
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      - uses: actions/checkout@v4
 | 
					      - uses: actions/checkout@v4
 | 
				
			||||||
@@ -27,10 +27,14 @@ jobs:
 | 
				
			|||||||
          nix run .#nixpkgs.mine.x86_64-linux.attic-client -- \
 | 
					          nix run .#nixpkgs.mine.x86_64-linux.attic-client -- \
 | 
				
			||||||
            login --set-default colony https://nix-cache.nul.ie "${{ secrets.NIX_CACHE_TOKEN }}"
 | 
					            login --set-default colony https://nix-cache.nul.ie "${{ secrets.NIX_CACHE_TOKEN }}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      # - name: Check flake
 | 
					      - name: Check and build flake
 | 
				
			||||||
      #   run: nix flake check
 | 
					        id: build
 | 
				
			||||||
 | 
					        run: |
 | 
				
			||||||
 | 
					          # nix flake check
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					          path=$(nix build --no-link .#ci.x86_64-linux --json | jq -r .[0].outputs.out)
 | 
				
			||||||
 | 
					          echo "path=$path" >> "$GITHUB_OUTPUT"
 | 
				
			||||||
      - name: Push to cache
 | 
					      - name: Push to cache
 | 
				
			||||||
        run: |
 | 
					        run: |
 | 
				
			||||||
          path=$(nix build --no-link .#nixosConfigurations.middleman.config.system.build.toplevel --json | jq -r .[0].outputs.out)
 | 
					 | 
				
			||||||
          nix run .#nixpkgs.mine.x86_64-linux.attic-client -- \
 | 
					          nix run .#nixpkgs.mine.x86_64-linux.attic-client -- \
 | 
				
			||||||
            push main $path
 | 
					            push main ${{ steps.build.outputs.path }}
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										26
									
								
								flake.nix
									
									
									
									
									
								
							
							
						
						
									
										26
									
								
								flake.nix
									
									
									
									
									
								
							@@ -51,8 +51,8 @@
 | 
				
			|||||||
      ...
 | 
					      ...
 | 
				
			||||||
    }:
 | 
					    }:
 | 
				
			||||||
    let
 | 
					    let
 | 
				
			||||||
      inherit (builtins) mapAttrs;
 | 
					      inherit (builtins) mapAttrs replaceStrings;
 | 
				
			||||||
      inherit (lib) genAttrs recurseIntoAttrs evalModules;
 | 
					      inherit (lib) mapAttrs' filterAttrs nameValuePair recurseIntoAttrs evalModules;
 | 
				
			||||||
      inherit (lib.flake) flattenTree eachDefaultSystem;
 | 
					      inherit (lib.flake) flattenTree eachDefaultSystem;
 | 
				
			||||||
      inherit (lib.my) mkDefaultSystemsPkgs flakePackageOverlay;
 | 
					      inherit (lib.my) mkDefaultSystemsPkgs flakePackageOverlay;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -164,16 +164,34 @@
 | 
				
			|||||||
      pkgs = pkgs'.mine.${system};
 | 
					      pkgs = pkgs'.mine.${system};
 | 
				
			||||||
      lib = pkgs.lib;
 | 
					      lib = pkgs.lib;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      filterSystem = filterAttrs (_: c: c.config.nixpkgs.system == system);
 | 
				
			||||||
 | 
					      homes' =
 | 
				
			||||||
 | 
					        mapAttrs
 | 
				
			||||||
 | 
					          (_: h: h.activationPackage)
 | 
				
			||||||
 | 
					          (filterSystem self.homeConfigurations);
 | 
				
			||||||
 | 
					      systems' =
 | 
				
			||||||
 | 
					        mapAttrs
 | 
				
			||||||
 | 
					          (_: h: h.config.system.build.toplevel)
 | 
				
			||||||
 | 
					          (filterSystem self.nixosConfigurations);
 | 
				
			||||||
      shell = pkgs.devshell.mkShell ./devshell;
 | 
					      shell = pkgs.devshell.mkShell ./devshell;
 | 
				
			||||||
    in
 | 
					    in
 | 
				
			||||||
    # Stuff for each platform
 | 
					    # Stuff for each platform
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
      checks = flattenTree {
 | 
					      checks = flattenTree {
 | 
				
			||||||
        homeConfigurations = recurseIntoAttrs (mapAttrs (_: h: h.activationPackage)
 | 
					        homeConfigurations = recurseIntoAttrs homes';
 | 
				
			||||||
          (lib.filterAttrs (_: h: h.config.nixpkgs.system == system) self.homeConfigurations));
 | 
					 | 
				
			||||||
        deploy = recurseIntoAttrs (pkgs.deploy-rs.lib.deployChecks self.deploy);
 | 
					        deploy = recurseIntoAttrs (pkgs.deploy-rs.lib.deployChecks self.deploy);
 | 
				
			||||||
      };
 | 
					      };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      ci =
 | 
				
			||||||
 | 
					      let
 | 
				
			||||||
 | 
					        homes =
 | 
				
			||||||
 | 
					          mapAttrs'
 | 
				
			||||||
 | 
					            (n: v: nameValuePair ''home-${replaceStrings ["@"] ["-at-"] n}'' v)
 | 
				
			||||||
 | 
					            homes';
 | 
				
			||||||
 | 
					        systems = mapAttrs' (n: v: nameValuePair "system-${n}" v) systems';
 | 
				
			||||||
 | 
					      in
 | 
				
			||||||
 | 
					        pkgs.linkFarm "ci" (homes // systems);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      packages = flattenTree (import ./pkgs { inherit lib pkgs; });
 | 
					      packages = flattenTree (import ./pkgs { inherit lib pkgs; });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      devShells.default = shell;
 | 
					      devShells.default = shell;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user