Commit Graph

58 Commits

Author SHA1 Message Date
~siprel
e10d8ab9cb king: Fleshed out some IPC flows for new protocol. 2020-05-21 22:42:00 +00:00
Jared Tobin
9f50e97c62
Merge branch 'jt/rename-release-tarballs' (#2395)
* origin/jt/rename-release-tarballs:
  sh/release: rename vere release tarballs

Signed-off-by: Jared Tobin <jared@tlon.io>
2020-03-05 12:22:31 +04:00
ixv
ab793f1f70
Merge pull request #2397 from urbit/mp/os1/contacts-groups
contacts: prune unmanaged "share" flow, rename to "groups"
2020-03-04 14:42:41 -08:00
Matilde Park
aee2496588 contacts: rename, migrate '~contacts' to '~groups' 2020-03-04 16:13:12 -05:00
Jared Tobin
f891bef69f
sh/release: rename vere release tarballs
Historically Vere has used a simple 'vx.y.z' versioning scheme that
predates the monorepo structure introduced in 7ce50ad.  Going forward
it's expected that our blessed runtime king/serf binaries will follow
the scheme 'urbit-vx.y.z' to disambiguate them from other repository
subprojects.

This renames Vere release tarballs as their version followed by their
target platform.  So with the updated tag scheme, instead of e.g.
'urbit-linux64-vx.y.z.tgz' these will appear along the lines of
'urbit-vx.y.z-linux64.tgz'.
2020-03-04 18:32:48 +04:00
Jared Tobin
a1d489d977
Merge branch 'os1-rc' (#2365)
* origin/os1-rc: (439 commits)
  pills: updated brass and solid
  chat: pull room contacts from associated group
  chat: spell 'permanent' correctly
  eyre: remove padding from 'access' input
  chat: only delete metadata for a chat if you created it
  chat: settings inputs add borders on focus
  chat: remove console.log from metadataAction
  chat: style fixes during review, use metadata-hook
  chat: edit description, color settings
  chat: add update-metadata to metadata reducer
  chat: revise api.js to match data structures
  metadata-json: add json to action parsers
  chat: construct settings page for metadata
  chat: correct bottom border on join links
  chat: copy shortcodes
  chat: linkify unmanaged chats
  metadata-hook: support group members other than host creating shared resources
  contacts: add bg-gray0 to root page
  chat + contact views: updated for style and to assert that group-path must be equal to app-path if there are ships in the members set
  contacts: changed color + copy of "add to group" button
  ...
2020-03-04 15:48:05 +04:00
Isaac Visintainer
c502474942 Merge branch 'master' into os1-rc 2020-02-26 19:18:17 -08:00
Joe Bryan
871828ee66 ci: skip cachix push if env is not set and in a pr build 2020-02-26 17:44:13 -08:00
Jared Tobin
4c6b665e94
sh: ensure release dir exists in static king build
Fixes a minor bug that can occur when copying the resulting binary.

(Also removes the use of ldd, which doesn't apply in the static binary
case.)
2020-02-20 19:55:49 +04:00
Isaac Visintainer
00a9eb9eab Merge branch 'master' into os1-rc 2020-02-19 16:04:21 -08:00
Jared Tobin
915bf1332f
sh/release-archive: 'set -e' in header [ci skip]
Bail out on encountering any errors.
2020-02-18 16:32:21 +04:00
Jared Tobin
6acb751560
sh/merge-with-custom-msg: add checks [ci skip]
* Use 'set -e' to bail on any errors.
* If the pull request number is not specified, bail out.
* Print a simple pre-merge checklist before prompting for merge.
2020-02-17 18:21:34 +04:00
Isaac Visintainer
2c847ab9be updated sh/build-interface 2020-02-14 17:06:20 -08:00
Jared Tobin
696a1314f7
sh/merge-with-custom-msg: 'origin' handling fix [ci skip]
The KERNEL_CHANGED and PILLS_CHANGED variables used the revision with
'origin' stripped from it (intended for using in messages only), which
caused them to miss remote revisions.

Also tweaks the conditional so that the kernel diff only displays when
pills haven't been updated.
2020-02-14 10:47:18 +04:00
Jared Tobin
7be9ed95ab
sh/merge-with-custom-msg: add pill update check [ci skip]
It's very easy to forget to verify that pills have been updated
accordingly when the kernel changes.  This adds a warning that prints
when the kernel in the target has changed but the pills have not.

Also prompts the user for confirmation pre-merge.
2020-02-13 19:05:18 +04:00
Benjamin Summers
faec933b56 Merge branch 'master' of github.com:urbit/urbit into king-haskell 2020-02-05 15:44:11 -08:00
Jared Tobin
9c644c4333
sh: add release-archive script [ci skip]
Adds a simple helper script for creating release archives.
2020-02-01 12:11:33 +04:00
Jared Tobin
5918bd1fa1
build: make release tarballs extract to directory
Release tarballs previously didn't include a release directory, so the
files would be unceremoniously dumped into the user's current directory
when extracted.

Fixes #1400.
2020-01-31 10:16:10 +04:00
Benjamin Summers
7383f05177 Update scripts to point to urbit-king. 2020-01-23 21:34:21 -08:00
Jared Tobin
ccb27b1e6f
test-arvo-upgrade-path: don't install vere [ci skip]
Strictly we just want to test the upgrade path for *Arvo* in this
script.  Removing the 'make install' line makes sure that we use
whatever Vere version is accessible on our PATH.
2020-01-23 04:34:28 +04:00
Fang
16ae3b7298
ci: reject trailing whitespace 2020-01-03 21:54:35 +01:00
benjamin-tlon
fcae7e6587
Build Linux static executables. (#2120) 2019-12-19 08:11:59 -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 Summers
86420e64c8 I hate testing in CI. 2019-12-11 20:11:51 -08:00
Benjamin Summers
0ce787a196 First stab at running OSX build. 2019-12-11 19:59:45 -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 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
Ted Blackman
3ebeb8243f Merge remote-tracking branch 'origin/master' into king-haskell 2019-12-09 20:26:07 -05:00
Jared Tobin
baedc50567
sh: replace merge helper [ci skip]
Replaces the 'merge-and-update-solid' script with the simpler
'merge-with-custom-msg' which merges branches using a custom merge
commit message.

Maintainers may want to alias it locally via something like:

  git config alias.mu '!sh/merge-with-custom-msg'

Then use it via:

  git mu SOME_BRANCH SOME_PR_NUMBER
2019-12-07 17:05:26 +08:00
Jared Tobin
7ef7028423
build: add :soto, always install dependencies [ci skip]
Ensures that the JS associated with :soto is built when running `make
interface`.

Additionally, adding `npm install` as a mandatory step for all Landscape
builds goes some way towards resolving #1664, though it's not a complete
fix.
2019-11-26 09:56:31 +08:00
Jared Tobin
78a2dfcf8e
sh: fix merge-and-update-solid name [ci skip]
Just normalises the name of this one with our other scripts.
2019-11-21 16:23:00 +08:00
Jared Tobin
c7fe6f4082
sh: add OTA test helper script [ci skip]
Adds a script for helping to verify that an OTA update (i.e. from arvo
at one revision to another) applies cleanly.

This only performs the upgrade on a single fake ship, so it's limited in
what kind of problems it can identify.  It *can* catch particularly
nasty errors, however, so serves as a useful sanity check.
2019-11-15 19:42:55 +08:00
Jared Tobin
7ca71fb315
sh: add merge helper script [ci skip]
Often one needs to merge branches in which the LFS-stored solid pill
conflicts with what's in master.  The conflict has to be resolved
manually, but the procedure for doing so is mechanical in practice.
This adds a simple script for automating that.
2019-11-15 18:39:39 +08:00
Jared Tobin
fd3756a3b7 build: use HEAD in sh/create-ropsten-pills
If we're not on a branch, e.g. if we've checked out an arbitrary
revision, then 'git branch --show-current' sensibly won't give us any
output, and thus the pills produced by sh/create-ropsten-pills will be
misnamed.

Consuming HEAD with git-rev-parse has the same effect here, and should
work in all cases of interst.
2019-11-06 20:14:51 +09:00
Jared Tobin
432a321e0c
build: add ropsten-pills target to Makefile
Adds a script for creating Ropsten pills, then adds it to the Makefile
under the 'ropsten-pills' target.
2019-10-24 10:03:52 +08:00
Brendan Hay
4813d9829b
build: simplify image build interface
This removes the baked in codedump inspection and wrapper scripts
in favour of downstream tooling overriding this as necessary by
using FROM <image> in their respective dockerfile.
2019-10-22 10:18:37 +08:00
Elliot Glaysher
7a1d9b2d5d Merge remote-tracking branch 'origin/master' into king-haskell
(Respins pills due to conflict.)
2019-10-15 12:38:17 -07:00
Brendan Hay
578adc9363
build: move ops debug conditional usage to drv metadata
Rather than conditional reconstructing the "urbit/bin/urbit-debug -g"
string everytime using the debug conditional, this information has been
added to the derivation's .meta attribute.
2019-10-14 10:25:34 +02:00
Brendan Hay
55e6533e68
build: Trimming build target from container image tag 2019-10-06 10:44:02 -07:00
Brendan Hay
7070650bf6
build: Tag container images with git branch/sha build information 2019-10-05 11:16:59 -07:00
Brendan Hay
9fee1ffb12
Adding conditional gdb/coredump logging for debug images 2019-10-04 22:31:25 +02:00
Brendan Hay
a312651e58
Adding nix expressions to build/bake docker images 2019-10-03 20:21:41 +02:00
Benjamin Summers
7c6709de9b Merge branch 'master' of github.com:urbit/urbit into bs/uterm 2019-08-14 15:37:20 -07:00
Joe Bryan
0e4a20aa6f fixes unit-test failure predicate to also catch +test failures 2019-08-08 23:31:15 -07:00
Benjamin Summers
6302d5fb90 Can now |hi to King Haskell over Ames! (and merged Master) 2019-07-31 22:16:02 -07:00
Isaac Visintainer
4f6e1fe229 added single command to build interface files 2019-07-24 15:14:16 -07:00
Logan Allen
d4b5e0114c Added update-ivory-pill script 2019-07-19 16:05:46 -07:00
Joe Bryan
5989ee4d66 only update cachix if credentials are available 2019-07-15 14:46:36 -07:00
Joe Bryan
68ec55535d removes brass pill staging from merge builds in CI 2019-07-01 14:16:02 -07:00