Ted Blackman
597e36b8f9
kiln: fix local reinstall
2021-09-28 22:27:42 -04:00
Fang
de409e6edb
kiln: adjust dudes even if remote is identical
...
There might be cases where the local situation still doesn't match. This
lets us recover from that.
2021-09-29 00:56:35 +04:00
Ted Blackman
3f5dc4d5e5
kiln: give %commit fact on no-op download
2021-09-28 15:43:25 -04:00
Ted Blackman
5511cc95b5
docket,kiln: snapshot on %watch
2021-09-28 15:33:16 -04:00
Fang
400d2e4f44
Merge remote-tracking branch 'origin/lf/versioning-marks-dist' into dist
2021-09-28 17:13:33 +04:00
Fang
c9e8c8ca60
kiln: make dist desks public on-boot
...
So that our sponsees (and other ship) can install the software on them.
2021-09-28 16:22:37 +04:00
Liam Fitzgerald
77f7b05939
kiln: version external marks
2021-09-28 12:50:45 +10:00
Ted Blackman
ba353fbd36
kiln: local aeon 0 check
2021-09-27 21:47:42 -04:00
Ted Blackman
1a16496308
./symbolic-merge.sh base-dev arvo
2021-09-27 21:02:18 -04:00
Hunter Miller
9f45dce312
Merge branch 'dist' of github.com:urbit/urbit into dist
2021-09-27 18:57:16 -05:00
Hunter Miller
72e3aca57c
Merge branch 'ea/master-dist-deconflict' into dist
2021-09-27 18:56:49 -05:00
Hunter Miller
502f2e8a9c
Merge branch 'hm/btc-wallet-conflict-resolution' into ea/master-dist-deconflict
2021-09-27 18:55:45 -05:00
Ted Blackman
855e97d17a
kiln: update other agents on kernel updates
2021-09-27 19:34:15 -04:00
Fang
18701b2ad2
kiln: always check local desk when adjusting dudes
...
We do not care about what's on foreign, the local desk is the thing
we're taking action on. This is more robust in the face of absent
information about foreign desks etc.
Also stops pretending to take-commet during take-merge-main. We'll get a
separate commit event.
2021-09-28 00:57:38 +04:00
Edward Amsden
02d2185eb3
move hoons to base-dev
2021-09-27 15:10:19 -04:00
Ted Blackman
7665e75849
manual merge @liam-fitzgerald misc. fixes PR
2021-09-27 14:50:58 -04:00
Ted Blackman
c947f899e6
-jam-all-desks: prevent recursive tempfile cancer
2021-09-27 14:20:44 -04:00
Fang
ca6636b149
kiln: ensure +vats engine always initialized
...
This was not the case for +poke-install, leading us to write a vat to
state under the %$ desk.
2021-09-27 15:06:47 +04:00
Ted Blackman
ede1976745
kiln: partial fixes for +take-download scry crash
2021-09-27 00:08:11 -04:00
Ted Blackman
9aa8566a6e
-jam-all-desks
2021-09-26 22:03:13 -04:00
Ted Blackman
2544b79e4b
kiln,desks: remove %fish from /desk/bill; fix some other kiln issues
2021-09-26 17:03:26 -04:00
Ted Blackman
54e7f31d25
kiln: minor print cleanup
2021-09-26 15:32:27 -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
Ted Blackman
d81a4a7cba
dill,kiln: fixes for boot and same-kelvin OTAs
2021-09-26 00:20:37 -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
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
Liam Fitzgerald
5dadee5375
Merge remote-tracking branch 'origin/dist' into m/dist-ames-glob-fixes
2021-09-23 15:50:55 +10:00
Fang
6812d15480
gall, kiln: better migration logic
2021-09-22 22:34:20 +02:00
Liam Fitzgerald
f3befc8afc
hood: fix pause poke
2021-09-22 13:20:05 +10: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
571f8cef5e
kiln: actually unpause desk
2021-09-21 12:49:04 +10:00
Fang
da28fbfed9
Merge dist into m/distpilled
2021-09-20 19:35:51 +02: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
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
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
f7970cbac0
kiln: minor cleanup
2021-09-07 21:57:55 +03:00