Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Merge lastest hie-bios (with incoming master release 0.13) #4

Closed
wants to merge 49 commits into from
Closed

Merge lastest hie-bios (with incoming master release 0.13) #4

wants to merge 49 commits into from

Conversation

jneira
Copy link

@jneira jneira commented Oct 23, 2019

  • I've not able to build it with stack-8.2.2.yaml due a conflicts between the installed Cabal and the haddock-api

jneira and others added 30 commits September 25, 2019 15:28
@jneira @fendor
Fix code renaming in windows (haskell#1392)
92f0aa6 
* Taking in account terms between backquote and single quote

* Add comment
@jneira
Use the new key format in one line
b6de0a7
@jneira
Merge pull request haskell#1394 from jneira/azure-one-line-cache
1267d2b 
Use the new key format in one line for azure cache
@jneira
Extract extractTerm to extend handling of win delims
e2396f7
@jneira
Fix extractImportableTerm for windows handling os specific delims
3efbee3
@jneira
Fix extractModuleName for windows handling os specific delims
38cf06b
@jneira
Move extractTerm to HieExtras and reuse it
8cc09e6
@jneira
Merge pull request haskell#1399: Fix more code actions in windows
9feb2eb
@jneira @fendor
Handling Windows specific delimiters in func tests (haskell#1400)
5385087
@alanz
Use haskell-lsp(-types) 0.16
2060ffb
@alanz
Fix GHC 8.2.2 build
c281205
@alanz
Merge pull request haskell#1402 from alanz/haskell-lsp-0.16
7e36aa3 
Haskell lsp 0.16
@jneira
Add confirmation messages to install cabal and install hie with cabal
2ca7474
@jneira
Add stack-install-cabal target
fcb30e1
@fendor
Merge pull request haskell#1405 from jneira/stack-install-cabal
25678ff 
Add stack-install-cabal target and confirmation messages
@jneira
Install and run cabal found in user original $PATH
d5c50b9
@jneira
Some refactorings
5e21628
@jneira
Remove unused import
0037450
@jneira
Validate cabal after trying to install it
da3f777
@jneira
Take in account local cache dir
d1e442b
@alanz
Making tests more robust
5c58cd8
@jneira
Correct stack local install path and use a more precise name for the …
b5e388a 
…ugly hack
@alanz
Use current stack exe for circleci tests
78ec15d
@alanz
Tweak test names
5e58c51
@alanz
Explicitly log the args passed to MainHie
8046e48
@jneira
Merge pull request haskell#1406 from jneira/stack-install-cabal
53acb90 
Find and run cabal in user original $PATH
@alanz
Revert to stack 1.9.3
dbff14b 
Stack 2.1.3 does not build cabal-helper properly on initial run.
@jneira
Add instructions about install cabal with stack
7ab685b 
and update instructions to run the build script with cabal on windows
@jneira
Merge pull request haskell#1414 from haskell/jneira-update-readme
623f8f6 
Add instructions about install cabal with stack and update instructions to run the build script with cabal on windows in the README
@alanz
Merge pull request haskell#1413 from alanz/robust-tests
414bbee 
Robust tests
alanz and others added 19 commits October 20, 2019 21:53
@alanz
Update haskell-lsp to 0.17
60c0df2 
Together with haskell-lsp-types and lsp-test

This now supports LSP spec 3.15
@lukel97
Merge pull request haskell#1418 from alanz/haskell-lsp-0.17
3ec201f 
Update haskell-lsp to 0.17
@jneira
Merge branch 'master' using haskell-lsp-0.17
172a557
@alanz
Bump resolvers and deps
e53b221 
brittany-0.12.1
floskell-0.10.1
hlint-2.2.3
hsimport-0.11.0
@alanz
Clean up comment from yaml file
41cfce0
@jneira
Integrate changes from hie-bios
f561472
@alanz
Prevent CircleCI OOM on "Install Hoogle" step
627bf2d
@alanz
Merge pull request haskell#1419 from alanz/bump-resolvers
f478edd 
Bump resolvers and deps
@alanz
Preparing 0.13 release
3a17fce
@lukel97
Merge pull request haskell#1421 from alanz/prepare-0.13
38a6feb 
Preparing 0.13 release
@jneira
Add intermediate progress report notification
582ff05
@jneira
Correct progress title of second request
1cf6ab7
@jneira
Merge branch 'master' (incoming 0.13 release)
3dcedf8
@fendor
Merge pull request haskell#41 from jneira/hie-bios-haskell-lsp-0.17
89f8d83 
Merge branch 'master' (incoming 0.13 release including haskell-lsp-0.17)
@jneira
Merge branch 'hie-bios' into cabal-helper-helper
b95c9dc
@jneira
Bump up cabal-helper to master
8222708
@jneira
Ignore cabal.project.freeze
9c58f50
@jneira
Add clock-0.7.2 to stack-8.6.5.yaml
79b8c3f
@jneira
Remove unused import that caused build error with stack
baee740
@fendor
Copy link
Owner

fendor commented Oct 23, 2019

Merged in mpickering#41

@fendor fendor closed this Oct 23, 2019
@jneira
Copy link
Author

jneira commented Oct 23, 2019

Mmm, maybe i am missing some git foo but this branch still needs to be rebased or merged with https://github.com/mpickering/haskell-ide-engine before merge the pull requests, no? The pr is pointing that there are conflicting files.

@fendor
Copy link
Owner

fendor commented Oct 23, 2019

Right c-h-h needs to be rebased, but the changes are in mpickering/hie-bios, right?

@jneira
Copy link
Author

jneira commented Oct 23, 2019 •
edited
Loading

@fendor sorry for not comment out before it but the pr had some other minor changes:

  • checkout the lastest master in the cabal-helper-submodule to avoid a build error in windows
  • remove an unused import to avoid a build error with stack (due a -Werror-)
  • add clock-0.7.2 to stack-8.6.5.yaml

(they can be added after a rebase)

Right c-h-h needs to be rebased, but the changes are in mpickering/hie-bios, right?

yeah, i think with a rebase you will see cleaner the pr but i think the result (and the work) would be the same (modulo the merge commit).

fendor pushed a commit that referenced this pull request Dec 23, 2019
@mpickering
Merge pull request #4 from wz1000/hie-bios-wz1000
0d3af55 
Fix a bunch of stuff
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jneira @fendor @alanz @lukel97