ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-18 04:11:49 +03:00
Code Issues Packages Projects Releases Wiki Activity
16,854 Commits 6 Branches 0 Tags 164 MiB
7e124cd3dd
Commit Graph

16854 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Summers
7e124cd3dd Merge branch 'king-haskell' of github.com:urbit/urbit into merge-king 2019-12-16 14:43:44 -08:00
benjamin-tlon
33d5c4fae6
Merge pull request #2103 from urbit/kh/atom-bytes-bug 
Fix a bug in atom<->bytestring conversion.
 2019-12-16 12:21:22 -08:00
Benjamin Summers
0fa9086b4d Fix a nasty bug in atom<->bytestring conversion. 2019-12-16 02:22:18 -08:00
Benjamin Summers
66fc04fde7 TODO HACK WIP DONTCOMMIT: Suppress serf logging. 2019-12-13 02:50:54 -08:00
Benjamin Summers
a1be331ac8 Make HTTP Server more lenient. 2019-12-13 02:10:53 -08:00
Benjamin Summers
c49e26d556 TODO HACK DONT COMMIT: Log to stderr 2019-12-13 02:02:10 -08:00
Benjamin Summers
acdd9b82f5 Remove timer hack from king<->serf protocol (should be fixed?) 2019-12-12 19:01:24 -08:00
Benjamin Summers
2a5f2a2d6e Make http-server less picky about request IDs. 2019-12-12 19:01:03 -08:00
Benjamin Summers
b2526854e8 Fix king bug validate-events 2019-12-12 19:00:35 -08:00
Benjamin Summers
25aa8c9fb6 Merge branch 'king-haskell' of github.com:urbit/urbit into merge-king 2019-12-12 18:15:12 -08:00
benjamin-tlon
398d90227a
Merge pull request #2086 from urbit/kh/osx-release 
OSX Release Builds for King Haskell
 2019-12-12 00:25:42 -08:00
Benjamin Summers
641fb525d7 Alright, the cache is back. 2019-12-11 23:47:54 -08:00
Benjamin Summers
8989f1a8db Got rid of cachix by accident. 2019-12-11 23:24:10 -08:00
Benjamin Summers
73ca4a4201 Fuck! Why did Travis lose my cache? 2019-12-11 22:40:57 -08:00
Benjamin Summers
1bae15bc6b How about now? 2019-12-11 21:43:23 -08:00
Benjamin Summers
2fd0af0d71 OSX build seems to work. Does the linux build still work? 2019-12-11 21:07:05 -08:00
Benjamin Summers
86420e64c8 I hate testing in CI. 2019-12-11 20:11:51 -08:00
Benjamin Summers
bd79a92f9f No git-lfs required for OSX builds. 2019-12-11 20:08:54 -08:00
Benjamin Summers
0ce787a196 First stab at running OSX build. 2019-12-11 19:59:45 -08:00
Benjamin Summers
c5299c0b3d Build on linux and OSX. 2019-12-11 19:38:01 -08:00
Benjamin Summers
c3e52b25e9 Merge branch 'king-haskell' of github.com:urbit/urbit into merge-king 2019-12-11 00:22:49 -08:00
benjamin-tlon
4df89994d3
Merge pull request #2080 from urbit/kh/stacked 
WIP: Build King Haskell in CI
 2019-12-11 00:22:01 -08:00
Benjamin Summers
9bcfe72ec5 travis_retry doesn't work from bash scripts. 2019-12-10 23:46:03 -08:00
Benjamin Summers
e2765f3d2d CI cleanup. 2019-12-10 23:39:52 -08:00
Benjamin Summers
2bdd861ebb Small cleanup. 2019-12-10 23:25:14 -08:00
Benjamin Summers
56f0f844c1 Disable one ames test in CI. 2019-12-10 23:14:51 -08:00
Benjamin Summers
3a99fe7834 Remove Isle for now. 2019-12-10 23:06:58 -08:00
Benjamin Summers
fa394649ef Merge branch 'master' of github.com:urbit/urbit into merge-king 2019-12-10 22:57:52 -08:00
Benjamin Summers
2505daf5c4 Update king<->serf protocol. Thanks Joe! 2019-12-10 22:57:05 -08:00
Benjamin Summers
b5919df50d Remove SDL dependency. 2019-12-10 22:38:35 -08:00
Benjamin Summers
69d897cce9 Build everything and run tests. 2019-12-10 22:24:19 -08:00
Benjamin Summers
624e054be4 Actually use lmdb-static package plus don't build all deps. 2019-12-10 22:06:43 -08:00
Benjamin Summers
a46ce7b1cc Steal my lmdb-static package from the king-nix branch. 2019-12-10 21:51:39 -08:00
Benjamin Summers
c297bad9cf Fix installing stack. 2019-12-10 21:37:29 -08:00
Benjamin Summers
0f04a0a0fe Try to do a stack build in CI. 2019-12-10 21:19:07 -08:00
Philip Monk
0c95c2d4dd
Merge pull request #2078 from urbit/philip/ames-forward 
ames: don't forward up the sponsorship chain
 2019-12-10 16:51:52 -08:00
Philip Monk
29f078bb14
ames: don't forward up the sponsorship chain 
This is *actually* why the galaxies are under so much load.  They're in
a forwarding loop with their stars, and this breaks the loop.
 2019-12-10 16:20:12 -08:00
Jared Tobin
853e33d88a
Merge branch 'newt-test' (#2069) 
* origin/newt-test:
  vere: adds tests for newt ipc framing, fixes infinite loop

Signed-off-by: Jared Tobin <jared@tlon.io>
 2019-12-10 19:40:39 +08:00
Jared Tobin
733d7fd7e5
Merge branch 'philip/leave' (#2068) 
* philip/leave:
  gall: remove message type from wire

Signed-off-by: Jared Tobin <jared@tlon.io>
 2019-12-10 19:34:30 +08:00
Philip Monk
68279d91e4
gall: remove message type from wire 
%leave over the network didn't work because we included the message type
in the wire from gall, so the duct for the initial %watch and the %leave
were different.  We need to know the message type so we can route the
acknowledgment as %poke-ack, %watch-ack, or no-op.

This moves this piece of information to a piece of state, where we queue
up the message types per [duct wire].  Ames guarantees that
acknowledgments will come in order.

This also includes an easy state adapter.  The more interesting part of
the upgrade is that we likely have outstanding subscriptions with the
old wire format.  The disadvantage of storing information in wires is
that it can't be upgraded in +load.  So, here we listen for updates on
the old wire format, and when we get them we kill the old subscription,
so that it will be recreated with the new wire format.

As an aside, this is a good example of what we mean when we say
subscriptions may be killed at any time, so apps must handle this case.

Finally, this fixes the "attributing" ship to ~zod for agent requests.
This information was ignored for agent requests, but including it causes
spurious duct mismatches.
 2019-12-10 19:32:26 +08:00
Jared Tobin
d21310ace8
Merge branch 'la-unread' (#2064) 
* origin/la-unread:
  chat-js: fix unread counts and indentation

Signed-off-by: Jared Tobin <jared@tlon.io>
 2019-12-10 17:05:43 +08:00
Jared Tobin
3f50a11e48
Merge branch 'philip/drum' (#2063) 
* origin/philip/drum:
  drum: revert tang ordering change

Signed-off-by: Jared Tobin <jared@tlon.io>
 2019-12-10 16:26:49 +08:00
Jared Tobin
69c2f5517c
Merge branch 'malloc-print' (#2061) 
* origin/malloc-print:
  vere: print arg to c3_malloc() et. al. on failure

Signed-off-by: Jared Tobin <jared@tlon.io>
 2019-12-10 16:19:11 +08:00
Benjamin Summers
545362e766 repn in Haskell. 2019-12-09 19:44:42 -08:00
Ted Blackman
5e7605ed25 king: update ames for alef 2019-12-09 21:45:19 -05:00
Joe Bryan
1f05927558 vere: adds tests for newt ipc framing, fixes infinite loop 2019-12-09 18:18:07 -08:00
Ted Blackman
3ebeb8243f Merge remote-tracking branch 'origin/master' into king-haskell 2019-12-09 20:26:07 -05:00
Logan Allen
30264bbc93 chat-js: fix unread counts and indentation 2019-12-09 13:05:56 -08:00
Philip Monk
5ff9e04204
drum: revert tang ordering change 
Turns out this wasn't a regression, it was intended behavior.  I
continue to believe it's the wrong behavior, but that will require a
longer discussion.
 2019-12-09 11:47:48 -08:00
Jared Tobin
96621c6062
Merge branch 'm/chat-hook-kickback' (#2059) 
* origin/m/chat-hook-kickback:
  chat-hook: no-op on /backlog kick if not synced

Signed-off-by: Jared Tobin <jared@tlon.io>
 2019-12-09 20:47:16 +08:00