about summary refs log tree commit diff
path: root/src/ci
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2020-03-16 01:30:33 +0100
committerGitHub <noreply@github.com>2020-03-16 01:30:33 +0100
commitfdb5df049ca21cd7c15eecc9c978708a4f052832 (patch)
treeb1ee391e0747fd25d56603f08af48c9dfa430738 /src/ci
parentbbdc871c5377e4c78a565d26f232a11516fe38f9 (diff)
parent3f58ab6e24af34265229f701d48eb240cc06d751 (diff)
downloadrust-fdb5df049ca21cd7c15eecc9c978708a4f052832.tar.gz
rust-fdb5df049ca21cd7c15eecc9c978708a4f052832.zip
Rollup merge of #69964 - ollie27:ci_nodejs, r=Mark-Simulacrum,GuillaumeGomez
Add Node.js to PR CI image

This should allow the `rustdoc-js` and `rustdoc-js-std` test suites to run automatically on PRs.
Diffstat (limited to 'src/ci')
-rw-r--r--src/ci/docker/x86_64-gnu-llvm-7/Dockerfile3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ci/docker/x86_64-gnu-llvm-7/Dockerfile b/src/ci/docker/x86_64-gnu-llvm-7/Dockerfile
index dc90c286f5c..4cd9e164558 100644
--- a/src/ci/docker/x86_64-gnu-llvm-7/Dockerfile
+++ b/src/ci/docker/x86_64-gnu-llvm-7/Dockerfile
@@ -16,7 +16,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   libssl-dev \
   pkg-config \
   zlib1g-dev \
-  xz-utils
+  xz-utils \
+  nodejs
 
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh