Skip to content

Commit 7e84ce3

Browse files
committed
ci/gha: Disable linkcheck on darwin
Does not reproduce all settings on darwin. (Pre-existing issue) Build with `nix build .#nix-manual.tests.linkcheck`
1 parent 9f32239 commit 7e84ce3

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

ci/gha/tests/default.nix

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,29 @@ rec {
107107
};
108108
};
109109

110+
disable =
111+
let
112+
inherit (pkgs.stdenv) hostPlatform;
113+
in
114+
args@{
115+
pkgName,
116+
testName,
117+
test,
118+
}:
119+
lib.any (b: b) [
120+
# FIXME: Nix manual is impure and does not produce all settings on darwin
121+
(hostPlatform.isDarwin && pkgName == "nix-manual" && testName == "linkcheck")
122+
];
123+
110124
componentTests =
111125
(lib.concatMapAttrs (
112126
pkgName: pkg:
113-
lib.concatMapAttrs (testName: test: {
114-
"${componentTestsPrefix}${pkgName}-${testName}" = test;
115-
}) (pkg.tests or { })
127+
lib.concatMapAttrs (
128+
testName: test:
129+
lib.optionalAttrs (!disable { inherit pkgName testName test; }) {
130+
"${componentTestsPrefix}${pkgName}-${testName}" = test;
131+
}
132+
) (pkg.tests or { })
116133
) nixComponentsInstrumented)
117134
// lib.optionalAttrs (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) {
118135
"${componentTestsPrefix}nix-functional-tests" = nixComponentsInstrumented.nix-functional-tests;

flake.nix

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,6 @@
325325
pkgs = nixpkgsFor.${system}.native;
326326
nixFlake = self;
327327
}).topLevel
328-
// {
329-
inherit (self.packages.${system}.nix-manual.tests) linkcheck;
330-
}
331328
// (lib.optionalAttrs (builtins.elem system linux64BitSystems)) {
332329
dockerImage = self.hydraJobs.dockerImage.${system};
333330
}

0 commit comments

Comments
 (0)