diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 18aad4cc..caff26ca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,13 +12,13 @@ jobs: steps: - uses: actions/checkout@v4 - uses: cachix/install-nix-action@v25 - - name: Evaluate hydraJobs + - name: Evaluate checks id: eval-jobs run: | MATRIX=$(nix eval \ --accept-flake-config \ --json \ - .#hydraJobs.x86_64-linux --apply builtins.attrNames \ + .#checks.x86_64-linux --apply builtins.attrNames \ ) echo "matrix=$MATRIX" >> $GITHUB_OUTPUT @@ -63,7 +63,7 @@ jobs: - check: qemu-overlay-systemd-startup-shutdown runs-on: ubuntu-latest env: - NIX_ATTR: 'hydraJobs.x86_64-linux.${{ matrix.check }}' + NIX_ATTR: 'checks.x86_64-linux.${{ matrix.check }}' steps: - name: Enable KVM group perms run: | diff --git a/flake.nix b/flake.nix index fb2f7f67..13afbb43 100644 --- a/flake.nix +++ b/flake.nix @@ -132,15 +132,14 @@ else result ) {} (builtins.attrNames self.nixosConfigurations); - # Takes too much memory in `nix flake show` - # checks = import ./checks { inherit self nixpkgs system; }; + checks = import ./checks { inherit self nixpkgs system; }; # hydraJobs are checks hydraJobs = builtins.mapAttrs (_: check: (nixpkgs.lib.recursiveUpdate check { meta.timeout = 12 * 60 * 60; }) - ) (import ./checks { inherit self nixpkgs system; }); + ) self.checks.${system}; }) // { lib = import ./lib { nixpkgs-lib = nixpkgs.lib; };