Commit Graph

6877 Commits

Author SHA1 Message Date
Simon Højberg
a725f91dab Env vars: rename UCM_BIND to UCM_HOST 2021-03-19 09:40:22 -04:00
Simon Højberg
3d4e4f5686 Update README with ucm env var instructions 2021-03-18 15:47:04 -04:00
Mike (stew) O'Connor
e652751454
Merge pull request #1845 from stew/feature/codebase-envvars
allow port / token / ip for codebase server to come from environment …
2021-03-17 22:09:22 -07:00
Stew O'Connor
4e1b7e0c00 allow port / token / ip for codebase server to come from environment variables 2021-03-17 15:22:49 -07:00
Arya Irani
4d147b0c02
Merge pull request #1838 from ceedubs/bugfix-1648
name.segments test: don't pick from an empty list
2021-03-16 23:52:19 -04:00
Arya Irani
497d5af155
Merge pull request #1835 from ceedubs/update-stack-resolver
stack resolver nightly-2021-01-02 -> lts-17.5
2021-03-16 23:51:34 -04:00
Cody Allen
8a774319a2
stack resolver nightly-2021-01-02 -> lts-17.5
This also moves from ghc 8.10.3 to 8.10.4.

My main motivation was making some versions line up for a newer
packaging of haskell-language-server, but it seemed like it might
generally be good to move from a nightly to an lts version?
2021-03-16 19:19:51 -07:00
Arya Irani
0e7b6bc2b9
Merge pull request #1839 from unisonweb/stack-in-ci
Use stack to install GHC in CI (fixes #1782)
2021-03-16 18:51:51 -04:00
Mitchell Rosen
0f64a486e2 Use stack to install GHC in CI 2021-03-16 15:10:49 -04:00
Cody Allen
49ca817535
EasyTest: better message when pick is called with empty list 2021-03-16 08:23:47 -07:00
Cody Allen
9f3ce3838c
name.segments test: don't pick from an empty list
Resolves #1648.

Technically I think that this has slightly different RNG characteristics
than the old implementation, but I wouldn't expect it to matter for
the sake of the test.
2021-03-15 19:21:24 -07:00
Arya Irani
0a45ac194a
Merge pull request #1833 from samgqroberts/1800-followon
minor update to `run.md` transcript
2021-03-15 12:18:06 -04:00
Arya Irani
490e71213f
Merge pull request #1837 from unisonweb/macos-11.10-check
does the macOS-11.0 CI image work yet?
2021-03-15 11:31:31 -04:00
Arya Irani
4eb572d9e4
Merge pull request #1834 from ceedubs/explicit-branch
Tests: explicit branch name in git init
2021-03-14 22:41:11 -04:00
Arya Irani
d9cd17110d
Update ci.yaml 2021-03-14 22:02:37 -04:00
Arya Irani
abe9ecd5b1
Update ci.yaml 2021-03-14 11:46:33 -04:00
Arya Irani
d754361665
does the macOS-11.10 CI image work yet? 2021-03-13 16:31:40 -05:00
Cody Allen
334fa29607
Tests: explicit branch in git init
Before this change, when I ran the tests I got the following "hints"
printed to the console:

```
hint: Using 'master' as the name for the initial branch. This default branch name
hint: is subject to change. To configure the initial branch name to use in all
hint: of your new repositories, which will suppress this warning, call:
hint:
hint:   git config --global init.defaultBranch <name>
hint:
hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
hint: 'development'. The just-created branch can be renamed via this command:
hint:
hint:   git branch -m <name>
```

I think that this means that the tests could potentially fail, depending
on the user's local git config and/or version.

I tried using the `trunk` branch and the tests failed. It seems that
the tests are dependent on the `master` branch being used, so I figured
it was probably be best to explicitly specify that branch name.
2021-03-13 07:50:32 -08:00
Sam Roberts
fca1a59201 minor update to run transcript 2021-03-11 10:44:23 -05:00
Paul Chiusano
f941687229
Merge pull request #1827 from nini-faroux/seq-list 2021-03-06 06:51:38 -06:00
Paul Chiusano
4f0267ce79
Merge pull request #1831 from unisonweb/topic/restore-git-test
update git test after #1817
2021-03-05 12:32:44 -06:00
Arya Irani
a5eee694d4
Merge pull request #1832 from seagreen/comments
Add some Haddocks for key declarations
2021-03-05 12:44:25 -05:00
Ian Grant Jeffries
7ee453af18 Add some Haddocks for key declarations 2021-03-04 18:14:23 -05:00
Rúnar
4ae71ac9f1
Merge pull request #1829 from unisonweb/topic/codebaseserver-listingtags
Codebase server: indicate in namespace listing whether a term is a doc or a test, and if a type is an ability
2021-03-04 11:14:58 -05:00
Arya Irani
2785610aad update git test after #1817 2021-03-04 10:55:32 -05:00
runarorama
2f12f86642 add comments 2021-03-04 09:57:31 -05:00
runarorama
de9dd75998 Repair merge 2021-03-03 23:04:46 -05:00
runarorama
458574e6b3 oops 2021-03-03 22:56:36 -05:00
runarorama
c766837e3e Merge branch 'trunk' of github.com:unisonweb/unison into topic/codebaseserver-listingtags 2021-03-03 22:39:13 -05:00
runarorama
9225ee6ef1 Distinguish docs, tests, and abilities in listing 2021-03-03 22:30:56 -05:00
ninifaroux
f4b8e87258 add consistent list naming 2021-03-03 19:19:47 +00:00
Paul Chiusano
2b83c963f4
Merge pull request #1826 from unisonweb/topic/codebaseserver-morenames 2021-02-28 08:53:16 -06:00
Paul Chiusano
9623ef6471
Merge pull request #1825 from stew/bugfix/1824 2021-02-28 08:50:23 -06:00
runarorama
ceba095354 Fix merge 2021-02-27 20:30:21 -05:00
runarorama
95a5542a60 Merge branch 'trunk' of github.com:unisonweb/unison into topic/codebaseserver-morenames 2021-02-26 22:14:52 -05:00
runarorama
ddf86018ab Allow namespace lookup by hash 2021-02-26 22:11:35 -05:00
Stew O'Connor
e4c9041b25 Get rid of nondeterministic failure in thread.md
Fixes #1824
2021-02-26 09:44:12 -08:00
Rúnar
dd5aff29cb
Merge pull request #1786 from unisonweb/topic/codebaseserver-openapi
Add a codebase server
2021-02-26 00:28:32 -05:00
runarorama
5f6e305858 Merge branch 'trunk' of github.com:unisonweb/unison into topic/codebaseserver-openapi 2021-02-25 23:49:07 -05:00
runarorama
4a577bed2b Fix regression in term printer 2021-02-25 23:07:06 -05:00
runarorama
e51d959616 Merge branch 'trunk' of github.com:unisonweb/unison into topic/codebaseserver-openapi 2021-02-25 22:05:00 -05:00
Arya Irani
ffccd1131e
Merge pull request #1823 from seagreen/haddock
Add -haddock flag to help haskell-language-server
2021-02-25 21:26:13 -05:00
Ian Grant Jeffries
e4a118872a Add -haddock flag to help haskell-language-server
(See this issue: https://github.com/haskell/haskell-language-server/issues/208)

Adding -haddock gives doc-on-hover for 3rd party libraries like megaparsec.

I tested this on a big codebase (>20k SLOC) and compile times stayed the same.
2021-02-25 17:12:03 -05:00
Arya Irani
666919b87b
Merge pull request #1814 from samgqroberts/1747.run-type-error-message
provide more helpful error message when `run`ning an improperly-typed term
2021-02-25 16:35:21 -05:00
Mike (stew) O'Connor
533511b8fb
Merge pull request #1798 from stew/feature/nice-IO-names
Feature/nice io names
2021-02-25 08:30:07 -08:00
Stew O'Connor
d3bc3df9b4 Merge remote-tracking branch 'origin/trunk' into feature/nice-IO-names 2021-02-25 01:25:59 -08:00
Stew O'Connor
1c443459ea Treat transcripts starting with _ as prelude 2021-02-25 00:47:23 -08:00
runarorama
dcc8954fe5 Revert Referent data constructors 2021-02-24 22:58:22 -05:00
runarorama
5da295feb0 Merge branch 'topic/codebaseserver-morenames' of github.com:unisonweb/unison into topic/codebaseserver-openapi 2021-02-24 15:21:00 -05:00
runarorama
593e61e372 Merge branch 'trunk' of github.com:unisonweb/unison into topic/codebaseserver-openapi 2021-02-24 15:19:24 -05:00