summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames E. King III <jking@apache.org>2018-03-06 09:50:33 -0500
committerJames E. King III <jking@apache.org>2018-03-06 09:53:12 -0500
commit78755f5297ae931b1f2268e9215d041dc4c0dcc7 (patch)
tree11d83bee21b4bca1457ac3fe76f464bfe430bb85
parent0eb0b77a3b01145162db45ed7d38422079326854 (diff)
downloadthrift-78755f5297ae931b1f2268e9215d041dc4c0dcc7.tar.gz
THRIFT-4508: Fix node.js to be the desired version in docker ubuntu-artful image
-rw-r--r--LANGUAGES.md2
-rw-r--r--build/docker/ubuntu-artful/Dockerfile2
-rw-r--r--test/known_failures_Linux.json28
3 files changed, 10 insertions, 22 deletions
diff --git a/LANGUAGES.md b/LANGUAGES.md
index add3ae522..de37680e4 100644
--- a/LANGUAGES.md
+++ b/LANGUAGES.md
@@ -233,7 +233,7 @@ The Language/Library Levels indicate the minimum and maximum versions that are u
<td align=left><a href="lib/nodejs/README.md">node.js</a></td>
<!-- Since -----------------><td>0.6.0</td>
<!-- Build Systems ---------><td><img src="doc/images/cgrn.png" alt="Yes"/></td><td><img src="doc/images/cred.png" alt=""/></td>
-<!-- Language Levels -------><td>4.2.6</td><td>8.9.1</td>
+<!-- Language Levels -------><td>4.2.6</td><td>8.9.4</td>
<!-- Low-Level Transports --><td><img src="doc/images/cred.png" alt=""/></td><td><img src="doc/images/cred.png" alt=""/></td><td><img src="doc/images/cred.png" alt=""/></td><td><img src="doc/images/cred.png" alt=""/></td><td><img src="doc/images/cgrn.png" alt="Yes"/></td><td><img src="doc/images/cgrn.png" alt="Yes"/></td>
<!-- Transport Wrappers ----><td><img src="doc/images/cgrn.png" alt="Yes"/></td><td><img src="doc/images/cgrn.png" alt="Yes"/></td><td><img src="doc/images/cred.png" alt=""/></td>
<!-- Protocols -------------><td><img src="doc/images/cgrn.png" alt="Yes"/></td><td><img src="doc/images/cgrn.png" alt="Yes"/></td><td><img src="doc/images/cgrn.png" alt="Yes"/></td><td><img src="doc/images/cgrn.png" alt="Yes"/></td>
diff --git a/build/docker/ubuntu-artful/Dockerfile b/build/docker/ubuntu-artful/Dockerfile
index fe241c45f..0b5b8ed44 100644
--- a/build/docker/ubuntu-artful/Dockerfile
+++ b/build/docker/ubuntu-artful/Dockerfile
@@ -55,7 +55,7 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > /et
RUN add-apt-repository ppa:haxe/releases -y
# node.js
-RUN curl -sL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
+RUN curl -sL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
echo "deb https://deb.nodesource.com/node_8.x artful main" | tee /etc/apt/sources.list.d/nodesource.list
### install general dependencies
diff --git a/test/known_failures_Linux.json b/test/known_failures_Linux.json
index 6b8aadc8b..b302ae85b 100644
--- a/test/known_failures_Linux.json
+++ b/test/known_failures_Linux.json
@@ -13,22 +13,22 @@
"c_glib-rs_multic_framed-ip",
"cl-c_glib_binary_buffered-ip",
"cl-c_glib_binary_framed-ip",
- "cl-c_glib_multi_buffered-ip",
- "cl-c_glib_multi_framed-ip",
"cl-c_glib_multi-binary_buffered-ip",
"cl-c_glib_multi-binary_framed-ip",
+ "cl-c_glib_multi_buffered-ip",
+ "cl-c_glib_multi_framed-ip",
"cl-go_binary_buffered-ip",
"cl-go_binary_framed-ip",
- "cl-rb_binary_buffered-ip",
- "cl-rb_binary_framed-ip",
"cl-rb_binary-accel_buffered-ip",
"cl-rb_binary-accel_framed-ip",
+ "cl-rb_binary_buffered-ip",
+ "cl-rb_binary_framed-ip",
"cl-rs_binary_buffered-ip",
"cl-rs_binary_framed-ip",
- "cl-rs_multi_buffered-ip",
- "cl-rs_multi_framed-ip",
"cl-rs_multi-binary_buffered-ip",
"cl-rs_multi-binary_framed-ip",
+ "cl-rs_multi_buffered-ip",
+ "cl-rs_multi_framed-ip",
"cpp-dart_binary_http-ip",
"cpp-dart_compact_http-ip",
"cpp-dart_json_http-ip",
@@ -235,32 +235,20 @@
"java-d_compact_framed-ip",
"netcore-csharp_binary_buffered-ip-ssl",
"netcore-csharp_binary_framed-ip-ssl",
- "netcore-csharp_json_framed-ip-ssl",
- "netcore-csharp_json_buffered-ip-ssl",
"netcore-csharp_compact_buffered-ip-ssl",
"netcore-csharp_compact_framed-ip-ssl",
+ "netcore-csharp_json_buffered-ip-ssl",
+ "netcore-csharp_json_framed-ip-ssl",
"nodejs-cpp_binary_http-ip",
"nodejs-cpp_binary_http-ip-ssl",
"nodejs-cpp_compact_http-ip",
"nodejs-cpp_compact_http-ip-ssl",
"nodejs-cpp_json_http-ip",
"nodejs-cpp_json_http-ip-ssl",
- "nodejs-d_binary_buffered-ip",
- "nodejs-d_binary_buffered-ip-ssl",
- "nodejs-d_binary_framed-ip",
- "nodejs-d_binary_framed-ip-ssl",
"nodejs-d_binary_http-ip",
"nodejs-d_binary_http-ip-ssl",
- "nodejs-d_compact_buffered-ip",
- "nodejs-d_compact_buffered-ip-ssl",
- "nodejs-d_compact_framed-ip",
- "nodejs-d_compact_framed-ip-ssl",
"nodejs-d_compact_http-ip",
"nodejs-d_compact_http-ip-ssl",
- "nodejs-d_json_buffered-ip",
- "nodejs-d_json_buffered-ip-ssl",
- "nodejs-d_json_framed-ip",
- "nodejs-d_json_framed-ip-ssl",
"nodejs-d_json_http-ip",
"nodejs-d_json_http-ip-ssl",
"nodejs-dart_binary_buffered-ip",