Skip to content

Commit 39972b4

Browse files
committed
Skip android tests that require old LLVM versions
1 parent e44ea44 commit 39972b4

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

ci.nix

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
inherit (lib.systems.examples) ghcjs;
9292
} // lib.optionalAttrs (nixpkgsName == "unstable"
9393
&& (__match ".*llvm" compiler-nix-name == null)
94-
&& !builtins.elem compiler-nix-name ["ghc967" "ghc984" "ghc9102" "ghc9103"]
94+
&& !builtins.elem compiler-nix-name ["ghc967" "ghc984" "ghc9103"]
9595
&& system != "x86_64-darwin") {
9696
inherit (lib.systems.examples) wasi32;
9797
} // lib.optionalAttrs (nixpkgsName == "unstable"
@@ -111,9 +111,12 @@
111111
} // lib.optionalAttrs (__match ".*llvm" compiler-nix-name == null && system == "x86_64-linux" && nixpkgsName == "unstable" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc948"]) {
112112
# Out llvm versions of GHC seem to break for musl32
113113
inherit (lib.systems.examples) musl32;
114-
} // lib.optionalAttrs (system == "x86_64-linux" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc948"]) {
114+
} // lib.optionalAttrs (system == "x86_64-linux"
115+
&& !builtins.elem compiler-nix-name ["ghc967" "ghc984" "ghc9103"]) {
115116
inherit (lib.systems.examples) aarch64-android-prebuilt;
116-
} // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName != "unstable" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc948" "ghc9103" "ghc9103llvm" "ghc91320250523"]) {
117+
} // lib.optionalAttrs (system == "x86_64-linux"
118+
&& nixpkgsName != "unstable"
119+
&& !builtins.elem compiler-nix-name ["ghc967" "ghc984" "ghc9103" "ghc91320250523"]) {
117120
inherit (lib.systems.examples) armv7a-android-prebuilt;
118121
} // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && !builtins.elem compiler-nix-name ["ghc8107" "ghc902"]) {
119122
# TODO fix this for the compilers we build with hadrian (ghc >=9.4)

0 commit comments

Comments
 (0)