* master: (147 commits)
vere: bump version to 0.10.7
libsigsegv: disable stack vma check
vere: bump version to 0.10.6
ci: add travis as trusted user
jets: use appropriate macro
noun: add -C to control memo cache size
jets: restore fond/play/peek hooks
jam: add commented-out functionality to count size of atom
jets: cap memo cache and remove peek, play, and fond jets
noun: add functions to count size of noun
release: urbit-os-v1.0.23
interface/config: fix production build
soto: run +on-load migration once
publish, links: restore full height
sh/build-interface: amend for SPA
interface/CONTRIBUTING: amend for SPA / webpack
solid: update pill
hood + apps: fix OTA process for feat/SPA
hood: add version %6 for %file-server upgrade
chat: equally size both code + s3 buttons
...
This adds a new build stage called combine which takes the results
of the previous compile builds and packages them up into one
release tarball per platform.
1. Fix bug in test builds that was causing failures for some reason I
still don't understand.
`tee` output to stderr was failing with "resource temporarily
unavailable". The hack that fixed it was to simply write the herb
output to a file and dump it to stdout after it fully completes.
2. sh/cachix works without CACHIX keys. Simply doesn't upload in that case.
3. Write code to cache testbus builds (disabled for now)
4. fakeship builds get further in bootstrap sequence before committing.
This fixes problems with PRs from forked repos and enables the scripts
to be run locally.
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'.
* 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
...
* 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.
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.
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.
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.
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.
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
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.
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.
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.
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.
