-
Notifications
You must be signed in to change notification settings - Fork 238
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Move more CI to 20.09 (attempt 2) #975
Conversation
bors try |
tryTimed out. |
bors try |
bors try |
tryAlready running a review |
tryTimed out. |
bors try |
tryBuild failed: |
bors try |
tryBuild failed: |
bors try |
bors try |
tryAlready running a review |
bors try |
I'm actually not sure what's up with the emscripten problem. For one thing, the job that failed was for version 1.39.1, but the 20.09 that we're on has version 2.0.1. Strange. |
bors try |
tryAlready running a review |
Oh I see, we explicitly override the version. Mysterious. |
The version of emscripten ghcjs 8.8 needs is the old one that came with 20.03. I have set it up to just get it from nixpkgs 20.03 for now. The plan is to update ghcjs to use the new one, but that is likely to be quite involved. |
tryTimed out. |
We should add a comment before we merge, at least! |
bors try |
tryBuild succeeded: |
bors try |
tryBuild succeeded: |
bors try |
} // lib.optionalAttrs (system == "x86_64-linux" && (nixpkgsName == "R2009" || (!(__elem compiler-nix-name ["ghc8101" "ghc8102" "ghc810220201118"])))) { | ||
} // lib.optionalAttrs (system == "x86_64-linux" && ( | ||
(nixpkgsName == "R2009" && __elem compiler-nix-name ["ghc8101" "ghc8102" "ghc810220201118"]) | ||
|| (nixpkgsName == "R2003" && __elem compiler-nix-name ["ghc865"]))) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure this change matches the commit message? This turns off 8.10 + 20.09 and 8.6.5 + 20.03, is that what you meant to do?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ignore me, I can't read.
@@ -42,9 +40,11 @@ | |||
# We need to use the actual nixpkgs version we're working with here, since the values | |||
# of 'lib.systems.examples' are not understood between all versions | |||
let lib = nixpkgs.lib; | |||
in lib.optionalAttrs (nixpkgsName == "R2003" && (__elem compiler-nix-name ["ghc865" "ghc884"])) { | |||
in lib.optionalAttrs (nixpkgsName == "R2009" && (__elem compiler-nix-name ["ghc865" "ghc884"])) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe we should flip this and only run ghcjs tests on a particular chosen GHC version. IDK.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I also can't read here (for some reason I thought this was !elem
)
I think some more GHCJS tests are failing because we're building on more versions of GHC. I have a plan for dealing with "expected fail" tests better (PR following this one), but for now I think it's okay. |
tryTimed out. |
Updated the supported versions doc with a more comprehensive table. |
I think this is good to go, will merge in a bit. |
* Update default nixpkgs to 20.09 * Move more CI to work on 20.09 by default * IFD level 1 * Use nixpkgs 20.03 emscripten (needed for ghcjs) * Add missing materialized files * Add missing materialized files * Fix for ghc 8.8 build on darwin * Fix for ghcjs 8.8 build on darwin * Fix hls stack test eval for ghc810220201118 * ifdLevel 2 * Oops: accidentally turned on tests for experimental GHC * Revert "Fix hls stack test eval for ghc810220201118" This reverts commit b405cd7. * ifdLevel 3 * Disable GHC 8.6.5 windows cross on nixpkgs 20.09 * Update supported GHC doc with a table * Add emscripten comment Co-authored-by: Hamish Mackenzie <[email protected]>
No description provided.