urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-20 09:21:42 +03:00
Code Issues Packages Projects Releases Wiki Activity
23,069 Commits 768 Branches 10 Tags 215 MiB
5053b1f38b
Commit Graph

23069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
github-actions[bot]
5053b1f38b
Merge 85435e9a81 into release/next-js 2021-01-06 22:44:17 +00:00
Matilde Park
85435e9a81 release: urbit-os-v2.13 2021-01-06 17:38:34 -05:00
Matilde Park
d9be43ea6f Merge branch 'la/fix-4160' (#4234) 
* origin/la/fix-4160:
  graph-delete thread: properly remove entry from metadata-store and hook

Signed-off-by: Matilde Park <matilde.park@gmail.com>
 2021-01-06 17:28:14 -05:00
Logan Allen
c99bf65d81 graph-delete thread: properly remove entry from metadata-store and hook 2021-01-06 15:32:16 -06:00
matildepark
1b96410b94
Merge pull request #4197 from tylershuster/hark-title 
interface: document title
 2021-01-06 16:10:37 -05:00
Tyler Brown Cifu Shuster
207c9accde interface: document title 2021-01-06 12:54:52 -08:00
L
2725f5b2c0
Merge pull request #4216 from urbit/la/fix-4164 
4164: fixes display issue with jobs / gigs based on faulty hark state
 2021-01-06 12:24:36 -06:00
matildepark
bb48d8b3c7
Merge pull request #4224 from urbit/mp/landscape/patp-punctuation 
landscape: allow most patp punctation in tokenize
 2021-01-06 13:06:10 -05:00
github-actions[bot]
78556de387
Merge dde827b2d3 into release/next-js 2021-01-06 17:36:52 +00:00
Matilde Park
dde827b2d3 Merge branch 'mp/meta/deploy' (#4222) 
* origin/mp/meta/deploy:
  meta: update MAINTAINERS for auto-deploy
  meta: add CD development stream information

Signed-off-by: Matilde Park <matilde.park@gmail.com>
 2021-01-06 12:36:14 -05:00
Matilde Park
3612b35e99 meta: update MAINTAINERS for auto-deploy 2021-01-06 12:34:39 -05:00
github-actions[bot]
31b7b26022
Merge 3204e3b44d into release/next-js 2021-01-06 16:50:09 +00:00
Jared Tobin
3204e3b44d
Merge pull request #4232 from urbit/jt/merge-workflow 
Add a GitHub workflow that auto-merges master to release/next-js on push
 2021-01-06 20:49:21 +04:00
Jared Tobin
169908a1a4
meta: add merge action 2021-01-06 20:25:44 +04:00
Jared Tobin
eae48b76c6
meta: stage a merge workflow 
Adds a workflow that, on any push to master, will merge master to
release/next-js.

Presently targeted at another branch for testing.
 2021-01-06 20:25:44 +04:00
matildepark
5a502ae0f0
Merge pull request #4226 from tylershuster/overlay-state 
interface: fixes bug where profile overlay would crash due to hook use
 2021-01-05 22:16:46 -05:00
Tyler Brown Cifu Shuster
dbc452ff44 interface: fixes bug where profile overlay would crash due to hook use 2021-01-05 19:04:15 -08:00
Matilde Park
ad57a565dd Merge branch 'master' into release/next-js 2021-01-05 21:55:56 -05:00
matildepark
b5258fc916
glob.yml: remove on-PR globbing 
Sorry for direct push, just a critical issue.
 2021-01-05 21:55:26 -05:00
Matilde Park
746fa57d15 landscape: allow most patp punctation in tokenize 
Fixes #4183.
 2021-01-05 21:14:41 -05:00
Matilde Park
3abfcbd4ea statusbar: change color on collapsed text 2021-01-05 19:54:50 -05:00
Matilde Park
9159d92927 meta: correct environment in status bar 2021-01-05 19:33:04 -05:00
Matilde Park
113aad6db5 meta: remove unnecessary variable 2021-01-05 19:24:51 -05:00
Matilde Park
2c0ecc6494 meta: amend environment variable access 2021-01-05 19:18:35 -05:00
Matilde Park
b21f5e0f06 statusbar: add conditional dev stream render 2021-01-05 18:54:43 -05:00
Matilde Park
f24b1bdeac Merge branch 'master' into release/next-js 2021-01-05 18:53:48 -05:00
Jared Tobin
cb006f1992
Merge pull request #4223 from urbit/jt/glob-action-tweaks 
meta: glob action tweaks
 2021-01-06 03:53:00 +04:00
Jared Tobin
17f3431b43
meta: glob action tweaks 
Sets two environment variables, LANDSCAPE_STREAM and
LANDSCAPE_SHORTHASH, to be employed by landscape builds.  Also reverts
the janeway version used to v0.13.1 as the --dev flag is unnecessary.
 2021-01-06 03:40:46 +04:00
matildepark
03d7e5d96f
Merge pull request #4220 from urbit/ixv/fix-unread-resubscribe 
notifications: clear state before processing initial update
 2021-01-05 17:52:33 -05:00
Matilde Park
136efa76a3 Merge branch 'release/next-js' into ixv/fix-unread-resubscribe 2021-01-05 17:34:28 -05:00
fang
141fb07109
Merge pull request #4221 from urbit/m/hark-but-quiet 
landscape: remove hark-update printfs
 2021-01-05 23:21:21 +01:00
matildepark
8cbf726fa6
Merge pull request #4171 from tylershuster/local-state-hooks 
interface: convert local state to hooks
 2021-01-05 17:18:15 -05:00
fang
8538b4fd7b
landscape: remove hark-update printfs 2021-01-05 23:07:10 +01:00
Isaac Visintainer
cbdb8903fc notifications: clear state before processing initial update 2021-01-05 13:49:49 -08:00
Jared Tobin
af03292f48
Merge pull request #4198 from urbit/jt/lacd 
Add GitHub Action & Workflow for glob + OTA
 2021-01-06 00:17:22 +04:00
Logan Allen
599c4db175 interface: place priority in understanding state of channel in graphKeys 2021-01-05 12:35:39 -06:00
Jared Tobin
1f7e454a90
meta: use janeway v0.13.2 in glob action 2021-01-05 20:32:56 +04:00
Jared Tobin
d6e21e1519
meta: invoke janeway with --dev 
The --dev flag injects a development modal in Landscape when globbing.
 2021-01-05 19:15:14 +04:00
Matilde Park
63c2c95ba3 release: urbit-os-v2.12 2021-01-04 19:49:10 -05:00
Matilde Park
d44d1c0b64 Merge branch 'lf/update-log-order' (#4166) 
* origin/lf/update-log-order:
  graph-store: use +bap for update-log listification
  graph-store: add TODO comment for backwards tap
  graph-store: run update log in correct order

Signed-off-by: Matilde Park <matilde.park@gmail.com>
 2021-01-04 19:32:21 -05:00
Liam Fitzgerald
44ac3130f8
graph-store: use +bap for update-log listification 2021-01-05 08:23:12 +10:00
Liam Fitzgerald
3e1207283b
Merge remote-tracking branch 'origin/master' into lf/update-log-order 2021-01-05 08:18:12 +10:00
Jared Tobin
daad76b5e2
meta: pull in lfs files when using checkout action 
Some other commits have been squashed in:

meta: remove user declarations for glob action

This is a tricky problem.  SSH needs UID 0 to exist, and intuitively it
does (root), but we can't enforce that when GitHub is running our
container.  Specifying "USER 0:0" in the actions Dockerfile doesn't cut
it.

Instead it seems best to try and construct a shadow-utils setup on the
underlying Docker image.

meta: target glob workflow at release/next-js
 2020-12-19 13:18:15 -03:30
Jared Tobin
0e2cb45121
meta: don't sequence arguments in glob action defn 2020-12-19 10:46:55 -03:30
Jared Tobin
aa2cfe4767
meta: fix glob action location 2020-12-19 10:45:22 -03:30
Jared Tobin
e862dfa971
meta: don't sequence glob action arguments 2020-12-19 10:44:17 -03:30
Jared Tobin
03ed832737
meta: stage a 'glob' GitHub workflow 
Adds a workflow that executes the 'glob' action on every push and pull
request to the 'release/next-js' branch.

(For now this is just staged to the 'jt/lacd' branch for testing.)
 2020-12-19 10:40:20 -03:30
Jared Tobin
7b1b4d8cc6
meta: add a 'glob' GitHub action 
This action, when supplied with the appropriate arguments, will create a
Landscape glob from GITHUB_SHA [1] and deploy it OTA to the appropriate
ship.

It needs to be supplied the following:

* ship name
* base64-encoded GCP Service Account credentials
* a base64-encoded SSH secret key to be used for GCP actions
* the corresponding base64-encoded SSH public key

[1]: https://docs.github.com/en/free-pro-team@latest/actions/reference/environment-variables
 2020-12-19 10:30:59 -03:30
Philip Monk
598a46d1f7
Merge remote-tracking branch 'origin/la/spider-fix' into philip/gall-vega 2020-12-18 17:04:02 -08:00
Philip Monk
e0dfbc8083
gall: fix huck wires 2020-12-18 16:28:43 -08:00