Enable aarch64-linux in ci (#2069)

* Enable aarch64-linux in ci We are not building haskell.nix CI on ci.iog.io for now. * ifdLevel 0 * Bump nix-tools haskellNix * Bump nix-tools haskellNix * Disable aarch64-multiplatform-musl for now * ifdLevel 1 * Run Hydra * Drop nixpkgs R2211 from ci * ifdLevel 2 * ifdLevel 3 * Remove ghc9820230704 from ci
input-output-hk · Oct 2, 2023 · 3d2b0bf · 3d2b0bf
1 parent 54adb7f
commit 3d2b0bf
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 32 deletions.
diff --git a/ci.nix b/ci.nix
@@ -71,12 +71,7 @@
       # cabal-install and nix-tools plans.  When removing a ghc version
       # from here (so that is no longer cached) also remove ./materialized/ghcXXX.
       # Update supported-ghc-versions.md to reflect any changes made here.
-      nixpkgs.lib.optionalAttrs (nixpkgsName == "R2211") {
-        ghc8107 = false;
-        ghc902 = false;
-        ghc928 = false;
-        ghc947 = false;
-      } // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2305") {
+      nixpkgs.lib.optionalAttrs (nixpkgsName == "R2305") {
         ghc8107 = false;
         ghc902 = false;
         ghc928 = false;
@@ -89,7 +84,6 @@
         ghc928 = true;
         ghc947 = true;
         ghc962 = true;
-        ghc9820230704 = true;
         ${ghc980X nixpkgs} = true;
         ${ghc99X nixpkgs} = true;
       }));

diff --git a/flake.nix b/flake.nix
@@ -108,8 +108,7 @@
       systems = [
         "x86_64-linux"
         "x86_64-darwin"
-        # TODO switch back on when ci.iog.io has builders for aarch64-linux
-        # "aarch64-linux"
+        "aarch64-linux"
         "aarch64-darwin"
       ];
 

diff --git a/nix-tools/flake.lock b/nix-tools/flake.lock
diff --git a/nix-tools/flake.nix b/nix-tools/flake.nix
@@ -73,8 +73,9 @@
           # tarballs with static builds.
           // lib.optionalAttrs (pkgs.buildPlatform.system == "x86_64-linux")
             { binary-tarball = mkTarball pkgs.pkgsCross.musl64; }
-          // lib.optionalAttrs (pkgs.buildPlatform.system == "aarch64-linux")
-            { binary-tarball = mkTarball pkgs.pkgsCross.aarch64-multiplatform-musl; }
+          # aarch64-multiplatform-musl cross compile is currently broken
+          # // lib.optionalAttrs (pkgs.buildPlatform.system == "aarch64-linux")
+          #   { binary-tarball = mkTarball pkgs.pkgsCross.aarch64-multiplatform-musl; }
         );
     };