Compare commits
17 Commits
ad17dbc06e
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 92ee4a09d7 | |||
| 34f4b6aa37 | |||
| 2f2d6cbea8 | |||
| 69b09b6dda | |||
| a737d725ed | |||
| 6c1d1f3b2b | |||
| f338ef47d5 | |||
| 239e84c40c | |||
| ed820e79f8 | |||
| afeb415c98 | |||
| 256b24b97b | |||
| 492f73b600 | |||
| 76ddd85afe | |||
| 7affb8ef4b | |||
| 4ba823e5b7 | |||
| 51eecde59e | |||
| 9eb5c486ba |
@@ -17,7 +17,7 @@
|
||||
legacyPackages.${system} = pkgs;
|
||||
|
||||
hydraJobs = {
|
||||
inherit (self.legacyPackages.${system}.bsc-ci) test pkgs cross;
|
||||
inherit (self.legacyPackages.${system}.bsc-ci) tests pkgs cross;
|
||||
};
|
||||
|
||||
# propagate nixpkgs lib, so we can do bscpkgs.lib
|
||||
|
||||
@@ -46,7 +46,7 @@ let
|
||||
wxparaver = callPackage ./pkgs/paraver/default.nix { };
|
||||
};
|
||||
|
||||
test = rec {
|
||||
tests = rec {
|
||||
#hwloc = callPackage ./test/bugs/hwloc.nix { }; # Broken, no /sys
|
||||
#sigsegv = callPackage ./test/reproducers/sigsegv.nix { };
|
||||
hello-c = callPackage ./test/compilers/hello-c.nix { };
|
||||
@@ -101,9 +101,9 @@ let
|
||||
crossList = builtins.mapAttrs (t: v: buildList t (builtins.attrValues v)) cross;
|
||||
|
||||
pkgsList = buildList "ci-pkgs" (builtins.attrValues pkgs);
|
||||
tests = buildList "ci-tests" (collect isDerivation test);
|
||||
testList = buildList "ci-tests" (collect isDerivation tests);
|
||||
|
||||
all = buildList' "ci-all" [ pkgsList tests ];
|
||||
all = buildList' "ci-all" [ pkgsList testList ];
|
||||
|
||||
in bscPkgs // {
|
||||
# Prevent accidental usage of bsc attribute
|
||||
@@ -112,7 +112,7 @@ in bscPkgs // {
|
||||
# Internal for our CI tests
|
||||
bsc-ci = {
|
||||
inherit pkgs pkgsList;
|
||||
inherit test tests;
|
||||
inherit tests testList;
|
||||
inherit cross crossList;
|
||||
inherit all;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user