Commit Graph

4946 Commits

Author SHA1 Message Date
Fang
059fb9e1ee
dbug: fix dashboard for the softdist age
We can no longer rely on landscape to be installed and serving a
channel.js, so we bring our own.

App discovery works through gall now. We can only ask per desk though,
so we still need to talk to clay for the set of desks.
2021-09-26 14:21:54 +04:00
Ted Blackman
38767e5dee kiln: don't merge %kids from random desks 2021-09-26 01:07:45 -04:00
Ted Blackman
9d4cd216b3 kiln: +fmt for slogging 2021-09-26 01:07:23 -04:00
Philip Monk
a94e17915f clay: fix failure to load apps
When you loaded an app with an error, then fixed the error, it would
create the main gall %mult subscription at a time in the past.  Then,
clay would never fill the subscription since it couldn't get the old %a
entries for the apps.

This fixes the issue in two ways:  first, don't subscribe in the past.
Second, if clay can't get the old versions, just fire the subscription
anyway.
2021-09-26 00:26:37 -04:00
Ted Blackman
d81a4a7cba dill,kiln: fixes for boot and same-kelvin OTAs 2021-09-26 00:20:37 -04:00
Ted Blackman
8f115bf059 clay: remote-install desks during migration 2021-09-25 16:53:52 -04:00
Ted Blackman
bbc80f9d45 zuse,ames: ^^sein:title 2021-09-25 16:52:53 -04:00
Ted Blackman
ef65c9c152 +agents generator 2021-09-25 16:15:55 -04:00
Ted Blackman
2b27425dfe
Merge pull request #5254 from ryjm/jm/clay-trace
clay: print stacktrace on build failure
2021-09-25 15:43:30 -04:00
ryjm
154deb3281 clay: print stacktrace on build failure 2021-09-25 15:36:00 -04:00
Fang
ed516900e7
kiln: notify about local installs
Remote install send a %commit because they receive new files. Local
installs never receive files, so weren't notifying kiln subscribers.

Here we "manually" send a %commit fact when installing a local desk.
2021-09-25 18:26:04 +04:00
Fang
4ed2a5914b
eyre: bind most specific endpoint first
This sticks to the old behavior, which was briefly lost in recent
changes.
2021-09-25 17:44:31 +04:00
Fang
7d3fc3d9b1
eyre: update tests wrt recent changes 2021-09-25 17:16:39 +04:00
Fang
f51ac34517
dojo: reset =dir during migration
The base desk is the new default. If we leave the dir untouched, for
most users this means they remain on home, which gets rendered
explicitly in the prompt since it's no longer the default desk.
2021-09-25 15:43:43 +04:00
fang
fbf9ecd34c
Merge pull request #5246 from urbit/m/dojo-deskology
dojo: support running other-desk generators
2021-09-24 23:26:00 +02:00
Fang
dc5662b73e
dojo: finalize new +desk!generator syntax 2021-09-25 01:12:55 +04:00
Fang
369a6b7a47
eyre: allow overwriting existing bindings
Previously, if trying to bind to an endpoint that was already bound to,
eyre would reject it. This doesn't play very nicely in a softdist world
where uninstalled apps might not get a chance to clean up, and apps
might re-bind simply for being re-installed.

Here we change eyre to overwrite an existing binding if it conflicts
with the new one to be added.
2021-09-25 00:54:24 +04:00
Fang
ce09681b0a
clay: avoid migrating during boot
We set the "have we migrated yet" flag to true during boot, because
we're starting out in a post-migration world.

Also fixes a state version number.
2021-09-24 20:55:28 +04:00
Ted Blackman
6bf3a7fe4c Merge branch 'ted/dist-migrate-wip' into dist 2021-09-23 18:12:09 -04:00
Ted Blackman
c80fb82318 clay,kiln,landscape/notify: migration runs 2021-09-23 18:07:13 -04:00
Fang
9f89dadc41
dojo: support running other-desk generators
Syntax is +desk#gen. (We can probably find something nicer.)

:app|gen desugars to :app +desk#gen, where the desk is the desk the app
is running on.

:app|desk#gen currently broken, in the sense that the above desugaring
takes precedence.

+on-load just aborts any running user action to avoid having a
monstrously large state adapter.
2021-09-23 20:09:54 +02:00
Liam Fitzgerald
5dadee5375 Merge remote-tracking branch 'origin/dist' into m/dist-ames-glob-fixes 2021-09-23 15:50:55 +10:00
Ted Blackman
16abd02a66 gall: set %hood to %base during dist upgrade 2021-09-22 23:11:41 -04:00
Fang
6812d15480
gall, kiln: better migration logic 2021-09-22 22:34:20 +02:00
Fang
f70ec7f4c4
Merge remote-tracking branch 'origin/dist' into ted/dist-migrate-wip 2021-09-22 20:55:43 +02:00
Fang
eb1ec5b749
clay: clean up migration error case printfs 2021-09-22 15:45:04 +02:00
Liam Fitzgerald
f3befc8afc hood: fix pause poke 2021-09-22 13:20:05 +10:00
Fang
904165f83a
clay: don't forget the extra q
+load still nest-fails though.
2021-09-22 01:39:29 +02:00
Fang
f588ea9feb
clay: grab tmp desk jamfile correctly 2021-09-22 01:16:21 +02:00
Ted Blackman
30364ab29b clay: wip migration 2021-09-21 19:13:54 -04:00
Fang
0512ed1281
Revert "kiln: better +install-local fix"
This reverts commit e4949aeb6f.

The better fix wasn't better at all!
2021-09-21 19:06:03 +02:00
Fang
e4949aeb6f
kiln: better +install-local fix
We have an upstream, and it is local.
2021-09-21 17:53:17 +02:00
Fang
8d91e8a903
kiln: safer +install-local printf
We don't have upstream tracking state for local installs, so this
would just crash.
2021-09-21 17:32:27 +02:00
Liam Fitzgerald
e8148f20dd base-dev,arvo: update marks, add %ship mark 2021-09-21 14:51:57 +10:00
Liam Fitzgerald
848f52a8ad Merge remote-tracking branch 'origin/dist' into lf/dist-fixes 2021-09-21 13:44:12 +10:00
Liam Fitzgerald
571f8cef5e kiln: actually unpause desk 2021-09-21 12:49:04 +10:00
Hunter Miller
c7cafd8e1a permalink: fixed path and spider case 2021-09-20 21:09:19 -05:00
Fang
c0bfab9bf5
clay: wip migrate from desk jams
To work around mark availability issues.
2021-09-21 00:28:31 +02:00
Ted Blackman
55306b503c zuse: fix build errors 2021-09-20 17:22:32 -04:00
Fang
e9aa3821ef
zuse, clay: further wip migration 2021-09-20 23:13:04 +02:00
Fang
da28fbfed9
Merge dist into m/distpilled 2021-09-20 19:35:51 +02:00
Ted Blackman
fb8c73e39a zuse,clay: WIP +migrate-dist 2021-09-20 13:01:48 -04:00
Ted Blackman
04e010e6c8 Merge branch 'dist' into ted/dist-migrate-wip 2021-09-20 07:43:43 -04:00
Liam Fitzgerald
240b0bd077 arvo: start %herm by default 2021-09-20 14:43:59 +10:00
Liam Fitzgerald
7b9b0c62b7 various: update symbolic merges 2021-09-17 14:54:01 +10:00
Liam Fitzgerald
143a8e08e6 various: fix dependencies & tests 2021-09-17 14:51:19 +10:00
Ted Blackman
3b30b67a3e Merge branch 'ted/kiln-warp' into m/distpilled, and
modify Kiln to listen for %writ's from Clay to track commits to Clay
that were not generated by Kiln itself.
2021-09-16 12:25:02 -04:00
Fang
a29c3414d9
solid: support generating multi-desk pills
Notably, we include the base desk last. This is to ensure that the
other desks are present by the time kiln gets loaded from base, letting
it install the software on the other desks, as per 22ad2516c.
2021-09-15 23:53:52 +02:00
Fang
22ad2516c9
kiln: install from existing desks during +on-init
During kiln's +on-init, we now check for non-base (and non-kids) desks.
If any are present, we execute the install flow for them, and set them
to sync from our sponsor afterwards.

This depends on work done in d7afe3229, in that without those changes
the successive +find requests from kiln to clay would clobber each
other, leaving only the "install from sponsor" one active, thus never
actually installing the desk for which we already have the files.
2021-09-15 23:53:24 +02:00
Fang
d7afe32291
kiln: synchronize install flow for local desks
When installing from an existing local desk, kiln now scries the
relevant data out of clay instead of sending moves to it and awaiting
responses.

This prepares for coming kiln work.
2021-09-15 23:52:50 +02:00
Ted Blackman
577ec24459 kiln: WIP listen to %warp's too 2021-09-15 22:57:08 +03:00
Liam Fitzgerald
a433e4f911 Merge remote-tracking branch 'origin/dist' into lf/nu-hark-store 2021-09-14 12:40:52 +10:00
Liam Fitzgerald
b5ab6a7842 kiln: add pause, resume marks 2021-09-14 09:47:25 +10:00
Liam Fitzgerald
f95a182071 spider: store desk for http response 2021-09-13 21:01:42 +10:00
Ted Blackman
e34048a6c9
Merge pull request #5216 from urbit/lf/kiln-gall-fix-dead
kiln, gall: Fix removing agents from desk
2021-09-13 12:47:10 +03:00
Ted Blackman
19ffcd569b kiln: keep in +reset 2021-09-13 11:24:03 +03:00
Liam Fitzgerald
1ac0465da7 gall: ignore reload for dead agents
Fixes a bug where even if an agent was dead, if its source was modified,
then gall would still attempt a scry for its cage.
2021-09-13 08:43:57 +10:00
Liam Fitzgerald
e6e0f47435 kiln: kill agents before merge
If a remote commit is downloaded that simultaneously removes an agent from
desk.bill but also removes the associated source files, then the commit
will fail as gall will not have received the card to kill the agent yet.
Instead, we read our foreign copy of the bill in +take-download, and
kill any necessary agents there, preventing a reload of the deleted
agent from occurring.
2021-09-13 08:41:27 +10:00
Ted Blackman
7f411c5116 typo 2021-09-09 21:32:29 +03:00
Ted Blackman
e9466baf06 kiln: bump %base first 2021-09-09 21:31:44 +03:00
Ted Blackman
f148f40a34 kiln: |install to a new upstream less destructively 2021-09-09 21:17:30 +03:00
Ted Blackman
c394442cb1 kiln: fix missing +grad in marks 2021-09-09 21:16:10 +03:00
Ted Blackman
f7970cbac0 kiln: minor cleanup 2021-09-07 21:57:55 +03:00
Liam Fitzgerald
8eaf2310e0 kiln: add kiln-bump mark 2021-09-07 14:50:31 +10:00
Liam Fitzgerald
39a9ed4faa hood: fix update ordering
When we receive the %mere gift from clay, the kernel has not yet been
reloaded. This means any attempts to bump desks will fail, as they will
be bumped against the old kernel. Rectifies this by continuing the %base
desk update flow in +on-load, instead of +take-merge-main. Also adds a
wef=(unit weft) to the state in order to discriminate whether or not the
kernel has just been reloaded
2021-09-07 14:37:36 +10:00
Ted Blackman
6d7d168735 Revert "Merge branch 'dist' of github.com:urbit/urbit into dist"
This reverts commit f50f2cd1f3, reversing
changes made to 248b968550.
2021-09-06 21:13:07 +03:00
Ted Blackman
f50f2cd1f3 Merge branch 'dist' of github.com:urbit/urbit into dist 2021-09-06 18:22:49 +03:00
Ted Blackman
248b968550 kiln: |pause and |resume an app 2021-09-06 17:27:17 +03:00
Liam Fitzgerald
f24fbe3eba Merge remote-tracking branch 'origin/dist' into lf/nu-hark-store 2021-09-06 14:34:46 +10:00
Liam Fitzgerald
76e033c649 landscape: upgrade for new hark-store 2021-09-06 13:31:11 +10:00
Liam Fitzgerald
5bcc0e98c8 spider: store desk for http response 2021-09-02 10:44:49 +10:00
Ted Blackman
f3e15396f3 %garden-dev desk; also cleaned up %base-dev 2021-09-02 00:37:56 +03:00
Ted Blackman
63fac6bec2 kiln: parameterize +bump on kelvin 2021-09-01 03:00:40 +03:00
Ted Blackman
e0874f22fa kiln: revise +bump 2021-09-01 02:43:25 +03:00
Ted Blackman
572e23e43d Merge branch 'ted/dist-temp' into dist 2021-08-31 02:34:48 +03:00
Ted Blackman
84c043d921 lull,clay: WIP migration 2021-08-31 02:25:36 +03:00
Ted Blackman
844386076f %base: symlinks; some -test tests fail 2021-08-30 20:39:37 +03:00
Ted Blackman
91714f5579 lull,dill,gall,kiln: move %pyre to :agent:gall 2021-08-27 18:06:53 +03:00
Ted Blackman
68a80660b2 kiln: don't die so easily in +bump 2021-08-27 17:38:30 +03:00
Liam Fitzgerald
f8edf723e0 kiln: add vats-diff mark 2021-08-27 13:19:45 +10:00
Ted Blackman
dda7f13e0e clay: WIP migrate from master 2021-08-26 19:32:52 +03:00
Liam Fitzgerald
b60aada75e spider: parameterize desk in http request 2021-08-26 12:13:15 +10:00
Ted Blackman
7bc19d04a4 hood: fix migration from master 2021-08-24 18:56:01 +03:00
Liam Fitzgerald
f85500b39d kiln: add lag scry 2021-08-24 14:09:12 +10:00
Liam Fitzgerald
c6ee0944db dojo: improve autocomplete between desks 2021-08-24 13:23:44 +10:00
Liam Fitzgerald
39f6eca798 kiln: add revive+suspend marks 2021-08-23 13:31:51 +10:00
Liam Fitzgerald
2d43877b15 Merge remote-tracking branch 'origin/ted/dist' into lf/kiln-json 2021-08-23 11:56:51 +10:00
Liam Fitzgerald
6a6897e009 kiln: update marks 2021-08-23 11:44:24 +10:00
Ted Blackman
d02652d799 kiln: update %base in +bump 2021-08-20 12:45:33 +03:00
Ted Blackman
f9e1812a14 sys,gen/kiln: kelvin checking seems to work 2021-08-20 10:41:16 +03:00
Ted Blackman
46dc260528 actual suspend and revive generators 2021-08-20 01:58:03 +03:00
Ted Blackman
4dfc09d1a4 kiln: |suspend,|revive 2021-08-20 01:57:31 +03:00
janeway
fa894b9690 glob: update to 0v758lj.uf0s5.0nh3m.gunn6.942gj 2021-08-19 15:25:15 -07:00
Ted Blackman
95045abce4 kiln: bunt if no /desk/bill 2021-08-20 00:02:43 +03:00
janeway
6ab7f53fff glob: update to 0v4.e52ik.udm4j.6aus5.02b25.vomaj 2021-08-18 18:12:52 -07:00
ixv
5f56eb9a1b Merge branch 'lf/aqua-revive' 2021-08-18 17:36:01 -07:00
ixv
2578233aed Merge remote-tracking branch 'hosted-fornet/add-crunch-library-and-generator' 2021-08-18 17:30:36 -07:00
ixv
6cd4f6d751 aqua: assert pill type 2021-08-18 17:25:17 -07:00
Ted Blackman
ea1d30a506 kiln: fix kelvin checking 2021-08-18 20:32:54 +03:00
Ted Blackman
6408baaa93 various: fix merge problems 2021-08-18 01:16:48 +03:00