Commit Graph

79 Commits

Author SHA1 Message Date
Liam Fitzgerald
669dfacd04
demo: add demo/testing agent for hook libraries 2021-03-19 10:12:50 +10:00
Liam Fitzgerald
6cecfaf430
Merge remote-tracking branch 'origin/master' into release/next-js 2021-03-05 15:24:14 +10:00
Matilde Park
0e50981c51 sh/build-interface: hotfix for api build 2021-02-26 16:41:05 -05:00
Jōshin
08791901b7 sh/poke-gcp-account-json: poke gcp storage values
To support GCP storage, we want to poke entries from a service account
JSON file into settings-store. This script does that.
2021-02-23 21:10:50 +00:00
Brendan Hay
50f66ce431
build: simplify make test and re-enable on darwin ci for testing 2020-10-29 13:17:05 +01:00
Brendan Hay
155e367daa
build: correcting double hash in update-ivory-pill shebang 2020-10-28 10:04:56 +01:00
Brendan Hay
db3383ff67
build: update makefile and scripts to match new nix expressions 2020-10-27 13:57:05 +01:00
Brendan Hay
48aa77a2fa
build: adding nix, shell, and haskell code formatters
These need to be run through the top-level nix-shell/shell.nix
2020-10-27 13:56:24 +01:00
Joe Bryan
6fa194d527 Merge branch 'master' into jb/ipc-redux
* 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
  ...
2020-06-26 13:33:00 -07:00
Elliot Glaysher
5e0f185df2 king: Build release tarballs with both king and vere.
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.
2020-06-23 14:02:54 -07:00
Matilde Park
1cc4067622 sh/build-interface: amend for SPA 2020-06-17 17:42:23 -04:00
Joe Bryan
8fac63661f vere: removes ncurses dependency 2020-06-11 20:25:46 -07:00
Joe Bryan
c3557e0836 Merge branch 'master' into ipc-redux-kh
* master: (25 commits)
  travis: Fix resource exhaustion error in test build.
  travis: Separate job for Haskell on Linux + bump nix version
  gall: properly handle empty outstanding ack queue
  vere: bump version to 0.10.5
  dawn: switch default eth node
  jets: patch cleanup
  Update os1-bug-report.md
  jets: switch openssl to the loom allocator.
  serf: disable automatic |pack
  release: urbit-os-v1.0.20
  behn: fix +unset-timer
  jael: send breach notifications in order
  jael: don't notify breach on initial update to ship
  jael: look for correct wire
  vere: handle failed cue of private key file
  u3: switches GMP import assert to conditional
  u3: fixes rock:load size printf
  vere: bypass terminal logging on lmdb worker thread
  vere: prevents term.c from retrying tcsetattr() indefinitely
  jets: jet decryption of aes-siv mode.
  ...
2020-06-11 19:07:13 -07:00
Benjamin Summers
f98d6131ff travis: Separate job for Haskell on Linux + bump nix version 2020-06-11 14:38:41 -07:00
~siprel
382ace5f23 travis: Various fixes and improvements.
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.
2020-06-11 20:34:50 +00:00
~siprel
f853557472 travis: Cache test results in cachix. 2020-06-11 01:00:26 +00:00
Benjamin Summers
fd72424b12 Fix make test + no logging during king-haskell tests. 2020-05-29 17:23:10 -07:00
Benjamin Summers
47247d86d2 Merge branch 'khrc' of github.com:urbit/urbit into ipc-redux-kh 2020-05-29 17:15:16 -07:00
benjamin-tlon
9b879470ae
Merge pull request #2831 from urbit/two-ship-king
Multi Tenet King w/ Shared HTTP/HTTPS
2020-05-29 16:30:31 -07:00
Philip Monk
d0b4d5a02e
release: urbit-os-v1.0.18 2020-05-26 17:41:42 -07:00
~siprel
e10d8ab9cb king: Fleshed out some IPC flows for new protocol. 2020-05-21 22:42:00 +00:00
Benjamin Summers
cb6d1c0f7f king: Started implementing multi-tenet HTTP. 2020-05-05 10:29:33 -07: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