Commit Graph

84 Commits

Author SHA1 Message Date
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
benjamin-tlon
ade1e59ce1
Get cross-compilation ready for release. (#1263)
* Add cross-compilation for `lmdb`.
* Got built caching working in CI with `cachix`.
* Cache cross compilation dependencies and toolchains.
* Do release builds in CI.
* Upload release builds to `bootstrap.urbit.org` on successful build.
* Lots of optimization work for CI.
* Boot from a solid pill in CI and load arvo with `-A`.
* Increase `vere` HTTP timeout to 15m.
2019-05-02 13:13:48 -07:00
Benjamin Summers
dcfe8aa162 Don't spam result-* files. 2019-04-25 17:10:22 -07:00
Benjamin Summers
8af0f5fa77 Use cachix in CI. 2019-04-25 17:05:16 -07:00
benjamin-tlon
1c4732ca22
Run urbit tests on the debug build, with GC enabled. (#1252)
* Run tests with `urbit-debug` and enable GC while running tests.
* Build `urbit-debug` with `-O0`.
2019-04-25 16:45:39 -07:00
benjamin-tlon
3c3f7e761e
Misc cleanup blocking CC-Release. (#1249)
* Move extraneous stuff out of pkg/urbit/*
* s/urb/herb/g
* Removed some boilerplate for `urbit` builds.
* Build urbit tests and run them in the nix build.
2019-04-24 17:27:27 -07:00
benjamin-tlon
edd57d380d
Finish cc-release cross-compilation. (#1202)
- Fixes the IPC bug
- Fixes the terminfo bug
- Moves the OSX SDK out of our nixcrpkgs fork.
- Vendor nixcrpkgs instead of having it be a submodule.
2019-04-23 19:50:38 -07:00
Elliot Glaysher
f388526fdb Remove the -L from the cp statements, since it is erroring on OSX. 2019-04-12 10:30:34 -07:00
benjamin-tlon
c86879e833
Nix Build + Monorepo Structure (#1196) 2019-03-04 16:43:53 -08:00