Merge pull request #67 from Mic92/joerg-ci

also expose packages in ci
nix-community · Nov 28, 2023 · bf5aa84 · bf5aa84
2 parents 36da051 + 6f0c923
commit bf5aa84
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -1,14 +1,12 @@
 queue_rules:
   - name: default
     merge_conditions:
-      - check-success=Evaluate flake.nix
-      - check-success=check smoketest [x86_64-linux]
-      - check-success=package default [x86_64-linux]
-      - check-success=package nix-ld [x86_64-linux]
+      - check-success=buildbot/nix-eval
 defaults:
   actions:
     queue:
       allow_merging_configuration_change: true
+      method: rebase
 pull_request_rules:
   - name: merge using the merge queue
     conditions:

diff --git a/flake.nix b/flake.nix
@@ -19,7 +19,11 @@
         nix-ld_32bit = pkgs.pkgsi686Linux.callPackage ./default.nix { };
       }));
     checks = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ] (system:
-      self.packages.${system}.nix-ld.tests
+      let
+        inherit (nixpkgs) lib;
+        packages = lib.mapAttrs' (n: lib.nameValuePair "package-${n}") self.packages.${system};
+      in
+      packages // self.packages.${system}.nix-ld.tests
     );
   };
 }