Skip to content

Commit d89b46e

Browse files
authored
Merge pull request #510 from Mic92/release-3.4.0
ci: remove separate build-flake job and add packages/devShells to checks
2 parents 1bb7669 + cb5e5f2 commit d89b46e

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

.github/workflows/test.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,4 @@ jobs:
1717
with:
1818
extra_nix_config: |
1919
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
20-
- run: nix build
2120
- run: nix develop -c pytest -s .
22-
build-flake:
23-
runs-on: ubuntu-latest
24-
steps:
25-
- uses: actions/checkout@v4
26-
- uses: cachix/install-nix-action@v31
27-
with:
28-
extra_nix_config: |
29-
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
30-
- name: List flake structure
31-
run: nix flake show
32-
- run: nix flake check -vL

flake.nix

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,14 @@
4040
// lib.optionalAttrs (pkgs.stdenv.isLinux) {
4141
nixpkgs-review-sandbox = pkgs.callPackage ./. { withSandboxSupport = true; };
4242
};
43+
44+
checks =
45+
lib.mapAttrs' (n: lib.nameValuePair "package-${n}") config.packages
46+
// lib.mapAttrs' (n: lib.nameValuePair "devShell-${n}") config.devShells;
47+
4348
devShells = {
4449
default = (self'.packages.nixpkgs-review-sandbox or self'.packages.nixpkgs-review).override {
45-
withNom = true;
50+
withNom = pkgs.hostPlatform.system != "riscv64-linux";
4651
};
4752
};
4853
};

0 commit comments

Comments
 (0)