Rename test to tests and tests to testList

Reviewed-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Tested-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>

.gitea/workflows/ci.yaml

@@ -0,0 +1,15 @@
+name: CI
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:all:
+    runs-on: native
+    steps:
+      - uses: https://gitea.com/ScMi1/checkout@v1.4
+      - run: nix build -L --no-link --print-out-paths .#bsc-ci.all

flake.nix

@@ -17,7 +17,7 @@
       legacyPackages.${system} = pkgs;
 
       hydraJobs = {
-        inherit (self.legacyPackages.${system}.bsc-ci) test pkgs;
+        inherit (self.legacyPackages.${system}.bsc-ci) tests pkgs cross;
       };
 
       # propagate nixpkgs lib, so we can do bscpkgs.lib

overlay.nix

@@ -6,9 +6,6 @@ with final.lib;
 let
   callPackage = final.callPackage;
 
-  mkDeps = name: pkgs: final.runCommand name { }
-    "printf '%s\n' ${toString (collect (x: x ? outPath) pkgs)} > $out";
-
   bscPkgs = {
     bench6 = callPackage ./pkgs/bench6/default.nix { };
     bigotes = callPackage ./pkgs/bigotes/default.nix { };
@@ -49,13 +46,7 @@ let
     wxparaver = callPackage ./pkgs/paraver/default.nix { };
   };
 
-in bscPkgs // {
+  tests = rec {
-  # Prevent accidental usage of bsc attribute
-  bsc = throw "the bsc attribute is deprecated, packages are now in the root";
-
-  # Internal for our CI tests
-  bsc-ci = {
-    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 { };
@@ -90,17 +81,39 @@ in bscPkgs // {
 
   pkgs = filterAttrs (_: isDerivation) bscPkgs;
 
-    pkgsList = final.runCommand "ci-pkgs" { }
+  crossTargets = [ "riscv64" ];
-      "printf '%s\n' ${toString (collect isDerivation bscPkgs)} > $out";
+  cross = prev.lib.genAttrs crossTargets (target:
+    final.pkgsCross.${target}.bsc-ci.pkgs
+  );
 
-    tests = final.runCommand "ci-tests" { }
+  buildList = name: paths:
-      "printf '%s\n' ${toString (collect isDerivation final.bsc-ci.test)} > $out";
+    final.runCommandLocal name { } ''
+      printf '%s\n' ${toString paths} | tee $out
+    '';
 
-    all = final.runCommand "ci-all" { }
+  buildList' = name: paths:
-    ''
+    final.runCommandLocal name { } ''
-      deps="${toString [ final.bsc-ci.pkgsList final.bsc-ci.tests ]}"
+      deps="${toString paths}"
       cat $deps
       printf '%s\n' $deps >$out
     '';
+
+  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);
+
+  all = buildList' "ci-all" [ pkgsList testList ];
+
+in bscPkgs // {
+  # Prevent accidental usage of bsc attribute
+  bsc = throw "the bsc attribute is deprecated, packages are now in the root";
+
+  # Internal for our CI tests
+  bsc-ci = {
+    inherit pkgs pkgsList;
+    inherit tests testList;
+    inherit cross crossList;
+    inherit all;
   };
 }