Commit Graph

4852 Commits

Author SHA1 Message Date
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
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