summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Dahl <ry@tinyclouds.org>2018-08-02 21:00:13 -0400
committerRyan Dahl <ry@tinyclouds.org>2018-08-02 23:12:49 -0400
commitd63e03a8e75ff39cec60f8d6fd82e57078373207 (patch)
tree6cfa1238572c47f2f9c7d07124c8de165eb49c12
parentd8b68648d10ec96d59883750885f7c7d694c180f (diff)
Use build.py -j2 on travis.
Avoids OOM during rollup.
-rw-r--r--.travis.yml3
-rw-r--r--README.md2
2 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 0c8966628..00cd5ed59 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,8 @@ install:
- export CCACHE_SLOPPINESS=time_macros
- ccache -s
- ./tools/setup.py
- - ./tools/build.py
+ # Travis hangs without -j2 argument to ninja.
+ - ./tools/build.py -j2
script:
- ./tools/lint.py
- ./tools/test.py $DENO_BUILD_PATH
diff --git a/README.md b/README.md
index a02aa9b11..2c81c8389 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Window [![Windows](https://ci.appveyor.com/api/projects/status/cc7nd82n34xo4nym/
* File system and network access can be controlled in order to run sandboxed
code. Defaults to read-only file system access and no network access.
- Access between V8 (unprivileged) and Golang (privileged) is only done via
+ Access between V8 (unprivileged) and Rust (privileged) is only done via
serialized messages defined in this
[flatbuffer](https://github.com/denoland/deno/blob/master/src/msg.fbs). This makes it
easy to audit.