Merge pull request #87 from hercules-ci/enable-darwin-build
ci.nix: Enable darwin build
This commit is contained in:
commit
8f2b953701
3 changed files with 11 additions and 7 deletions
|
@ -8,8 +8,11 @@ let
|
|||
options = eval.options;
|
||||
};
|
||||
|
||||
in pkgs.writeText "agent-options" ''
|
||||
in (pkgs.writeText "agent-options" ''
|
||||
= Arion options
|
||||
|
||||
${options.optionsAsciiDoc}
|
||||
''
|
||||
'').overrideAttrs (o: {
|
||||
# Work around https://github.com/hercules-ci/hercules-ci-agent/issues/168
|
||||
allowSubstitutes = true;
|
||||
})
|
||||
|
|
|
@ -24,15 +24,16 @@ dimension "Nixpkgs version" {
|
|||
|
||||
dimension "System" {
|
||||
"x86_64-linux" = { isReferenceTarget = isReferenceNixpkgs; };
|
||||
# TODO: darwin
|
||||
# "x86_64-darwin" = { enableNixOSTests = false; };
|
||||
"x86_64-darwin" = { enableNixOSTests = false; };
|
||||
} (
|
||||
system: { isReferenceTarget ? false }:
|
||||
system: { isReferenceTarget ? false, enableNixOSTests ? true }:
|
||||
let
|
||||
pkgs = import ./. { inherit system; nixpkgsSrc = sources.${nixpkgsSource}; };
|
||||
in
|
||||
{
|
||||
inherit (pkgs) arion tests;
|
||||
inherit (pkgs) arion;
|
||||
} // lib.optionalAttrs enableNixOSTests {
|
||||
inherit (pkgs) tests;
|
||||
} // lib.optionalAttrs enableDoc {
|
||||
inherit (pkgs) doc doc-options doc-options-check;
|
||||
} // lib.optionalAttrs isReferenceTarget {
|
||||
|
|
|
@ -18,7 +18,7 @@ spec = describe "evaluateComposition" $ it "matches an example" $ do
|
|||
{ evalUid = 123
|
||||
, evalModules = NEL.fromList
|
||||
["src/haskell/testdata/Arion/NixSpec/arion-compose.nix"]
|
||||
, evalPkgs = "import <nixpkgs> {}"
|
||||
, evalPkgs = "import <nixpkgs> { system = \"x86_64-linux\"; }"
|
||||
, evalWorkDir = Nothing
|
||||
, evalMode = ReadOnly
|
||||
, evalUserArgs = ["--show-trace"]
|
||||
|
|
Loading…
Reference in a new issue