Skip to content

Commit bf5aa84

Browse files
authored
Merge pull request #67 from Mic92/joerg-ci
also expose packages in ci
2 parents 36da051 + 6f0c923 commit bf5aa84

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

.mergify.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
queue_rules:
22
- name: default
33
merge_conditions:
4-
- check-success=Evaluate flake.nix
5-
- check-success=check smoketest [x86_64-linux]
6-
- check-success=package default [x86_64-linux]
7-
- check-success=package nix-ld [x86_64-linux]
4+
- check-success=buildbot/nix-eval
85
defaults:
96
actions:
107
queue:
118
allow_merging_configuration_change: true
9+
method: rebase
1210
pull_request_rules:
1311
- name: merge using the merge queue
1412
conditions:

flake.nix

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919
nix-ld_32bit = pkgs.pkgsi686Linux.callPackage ./default.nix { };
2020
}));
2121
checks = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ] (system:
22-
self.packages.${system}.nix-ld.tests
22+
let
23+
inherit (nixpkgs) lib;
24+
packages = lib.mapAttrs' (n: lib.nameValuePair "package-${n}") self.packages.${system};
25+
in
26+
packages // self.packages.${system}.nix-ld.tests
2327
);
2428
};
2529
}

0 commit comments

Comments
 (0)