From a80426ffd2d85aa1cb16d093d318847a2c00d953 Mon Sep 17 00:00:00 2001 From: Mateusz Galazyn Date: Tue, 16 Jul 2024 10:08:03 +0200 Subject: [PATCH] Enable aarch64-linux but disable it in hydra --- flake.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index b4086a9794..32fd21a16b 100644 --- a/flake.nix +++ b/flake.nix @@ -16,10 +16,7 @@ supportedSystems = [ "x86_64-linux" "x86_64-darwin" - # this is slow as we don't have aarch64-linux native builders as of 2024-04-03 - # disabling to reduce CI time initially. Uncomment later - # When you uncomment, lookup the "TODO generalize" comments in release-upload.yaml - # "aarch64-linux" + "aarch64-linux" "aarch64-darwin" ]; @@ -183,9 +180,8 @@ } ); in - lib.recursiveUpdate flake rec { + (lib.recursiveUpdate flake rec { project = cabalProject; - # add a required job, that's basically all hydraJobs. hydraJobs = nixpkgs.callPackages inputs.iohkNix.utils.ciJobsAggregates { @@ -221,7 +217,11 @@ # formatter used by nix fmt formatter = nixpkgs.alejandra; - } + }) + # Disable aarch64-linux hydraJobs as we don't have any native builders for this architecture + # as of 2024-07-15 so this would choke the CI. aarch64-linux binary building is enabled through + # cross-compilation. + // lib.optionalAttrs (system == "aarch64-linux") { hydraJobs = { }; } ); nixConfig = {