forked from haskell/haskell-language-server
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* 9.6 support Fixes hls-refactor-plugin 9.6 support hls-gadt-plugin Fix 9.4 build Fixes hls-gadt-plugin fixes WIP 9.6 patches fixes fixes fixes fixes fixes Fixes and add CI CI CI fixes patch haskell/actions for haskell/ghcup-hs#783 CI fixes CI fixes CI fixes CI CI CI CI CI Fix build on 9.0 Fix build on 9.0 hls-splice-plugin 9.6 compat fixes fixes fixes fixes Fix benchmark build errors 9.2.5 and 8.10.7 had build errors when running benchmarks due to `mfsolve` test suite having duplicate instances, so stop building tests for mfsolve (see: kuribas/mfsolve#8). Also, `http2-4.0.0` has a parse error due to a misplaced haddock comment that causes build failure with `-haddock`. It is fixed in the latest commit of the source repo, so use that in the `cabal.project` for now. Checkout correct commit on `pull_request` in CI By default, the `pull_request` event has a `GITHUB_SHA` env variable set to the "last merge commit on the GITHUB_REF branch" (see https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request). But we want to check out the latest commit on the branch whether or not it is a merge commit. This commit changes the CI actions to do just that. fixes Use head.hackage for 9.4 Only use head.hackage for 9.5 and up Reverts the change that caused head.hackage to be used for 9.4 as well Reintroduce source-repo-package for ekg-json Fix refactor plugin tests Fix missing constraint detection in refactor plugin ghc 9.6+ allow newer unordered-containers:template-haskell Some refactor tests no longer broken for 9.2 Fix simple-multi-test on 9.6 Mark simple-plugin as broken on 9.6 func-test fixes Disable unsupported plugins on 9.6 Eval plugin fixes Eval plugin test fixes, debug output in CI script Restore 'working' setup/actions WIP Fix GHC prerelease windows install Fix eval plugin T11 fixes Eval plugin fixes Fix splice plugin test Mark `simple plugin` ghcide test broken on 9.6 fixes fixes Use GHC 9.6-rc1 in CI Try using 9.6.1 for CI * 9.6 nix * Remove head.hackage * fixes * fixes * fixes * fixes * fixes * fixes
- Loading branch information
Showing
78 changed files
with
984 additions
and
228 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,12 +26,12 @@ runs: | |
| - name: Workaround runner image issue | ||
| if: runner.os == 'Linux' | ||
| # https://github.com/actions/runner-images/issues/7061 | ||
| run: | | ||
| run: | | ||
| sudo mkdir -p /usr/local/.ghcup | ||
| sudo chown -R $USER /usr/local/.ghcup | ||
| shell: bash | ||
|
|
||
| - uses: haskell/actions/[email protected].5 | ||
| - uses: haskell/actions/[email protected].6 | ||
| id: HaskEnvSetup | ||
| with: | ||
| ghc-version : ${{ inputs.ghc }} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| [ "9.4.4" , "9.2.5" , "9.0.2" , "8.10.7" ] | ||
| [ "9.6.1", "9.4.4" , "9.2.5" , "9.0.2" , "8.10.7" ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| { pkgs, inputs }: | ||
|
|
||
| let | ||
| disabledPlugins = [ | ||
| # That one is not technically a plugin, but by putting it in this list, we | ||
| # get it removed from the top level list of requirement and it is not pull | ||
| # in the nix shell. | ||
| "shake-bench" | ||
| "hls-retrie-plugin" | ||
| "hls-splice-plugin" | ||
| "hls-class-plugin" | ||
| "hls-rename-plugin" | ||
| "hls-gadt-plugin" | ||
| "hls-refactor-plugin" | ||
| ]; | ||
|
|
||
| hpkgsOverride = hself: hsuper: | ||
| with pkgs.haskell.lib; | ||
| { | ||
| hlsDisabledPlugins = disabledPlugins; | ||
|
|
||
| # Override for all derivation | ||
| # If they are considered as broken, we just disable jailbreak and hope for the best | ||
| mkDerivation = args: | ||
| hsuper.mkDerivation (args // | ||
| { | ||
| jailbreak = true; | ||
| broken = false; | ||
| doCheck = false; | ||
| }); | ||
| apply-refact = hsuper.apply-refact_0_12_0_0; | ||
| tagged = hself.callHackage "tagged" "0.8.7" { }; | ||
| primitive = hself.callHackage "primitive" "0.8.0.0" { }; | ||
| unix-compat = hself.callCabal2nix "unix-compat" inputs.haskell-unix-compat { }; | ||
| MonadRandom = hself.callHackage "MonadRandom" "0.6" { }; | ||
| hiedb = hself.callCabal2nix "hiedb" inputs.haskell-hiedb { }; | ||
| hie-bios = hself.callCabal2nix "hie-bios" inputs.haskell-hie-bios { }; | ||
| ghc-exactprint = hself.callCabal2nix "ghc-exactprint" inputs.haskell-ghc-exactprint { }; | ||
|
|
||
| # ptr-poker breaks on MacOS without SSE2 optimizations | ||
| # https://github.com/nikita-volkov/ptr-poker/issues/11 | ||
| ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { }; | ||
|
|
||
| ormolu = hself.ormolu_0_5_3_0; | ||
|
|
||
| stylish-haskell = appendConfigureFlag hsuper.stylish-haskell "-fghc-lib"; | ||
|
|
||
| # Re-generate HLS drv excluding some plugins | ||
| haskell-language-server = | ||
| hself.callCabal2nixWithOptions "haskell-language-server" ./. | ||
| # Pedantic cannot be used due to -Werror=unused-top-binds | ||
| # Check must be disabled due to some missing required files | ||
| (pkgs.lib.concatStringsSep " " [ "--no-check" "-f-pedantic" "-f-hlint" "-f-refactor" "-f-retrie" "-f-class" "-f-gadt" "-f-splice" "-f-rename" ]) { }; | ||
| }; | ||
| in { | ||
| inherit disabledPlugins; | ||
| tweakHpkgs = hpkgs: hpkgs.extend hpkgsOverride; | ||
| } |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.