Compare commits
16 Commits
master
...
ad17dbc06e
| Author | SHA1 | Date | |
|---|---|---|---|
|
ad17dbc06e
|
|||
|
46990fc8f7
|
|||
|
2d125cabaf
|
|||
|
00f5aad8e6
|
|||
|
4cbc9b81e3
|
|||
|
21516bd96b
|
|||
|
c30a1ed96d
|
|||
|
adbee036ef
|
|||
|
8092140a9c
|
|||
|
cf2239d2db
|
|||
|
6c54675da4
|
|||
|
d91db4afb4
|
|||
|
c07c5efbfa
|
|||
|
aa55166cf3
|
|||
|
914ee07439
|
|||
|
de99a89845
|
@@ -17,7 +17,7 @@
|
||||
legacyPackages.${system} = pkgs;
|
||||
|
||||
hydraJobs = {
|
||||
inherit (self.legacyPackages.${system}.bsc-ci) tests pkgs cross;
|
||||
inherit (self.legacyPackages.${system}.bsc-ci) test pkgs cross;
|
||||
};
|
||||
|
||||
# propagate nixpkgs lib, so we can do bscpkgs.lib
|
||||
|
||||
@@ -46,7 +46,7 @@ let
|
||||
wxparaver = callPackage ./pkgs/paraver/default.nix { };
|
||||
};
|
||||
|
||||
tests = rec {
|
||||
test = 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);
|
||||
testList = buildList "ci-tests" (collect isDerivation tests);
|
||||
tests = buildList "ci-tests" (collect isDerivation test);
|
||||
|
||||
all = buildList' "ci-all" [ pkgsList testList ];
|
||||
all = buildList' "ci-all" [ pkgsList tests ];
|
||||
|
||||
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 tests testList;
|
||||
inherit test tests;
|
||||
inherit cross crossList;
|
||||
inherit all;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user