summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames E. King III <jking@apache.org>2018-03-12 15:27:23 -0400
committerJames E. King III <jking@apache.org>2018-03-12 18:35:28 -0400
commita02ae56f7faf8f747551f6e333d001f872769033 (patch)
tree3e0c39cf2f51c6bcb2aa17dcff22dd0ba70d0f07
parent5785279e2e809f6c56dbbe0eb41d13fb17c88bdd (diff)
downloadthrift-a02ae56f7faf8f747551f6e333d001f872769033.tar.gz
THRIFT-4517: disable ocaml in xenial because it is broken
-rw-r--r--LANGUAGES.md2
-rw-r--r--build/docker/README.md2
-rw-r--r--build/docker/ubuntu-xenial/Dockerfile14
3 files changed, 10 insertions, 8 deletions
diff --git a/LANGUAGES.md b/LANGUAGES.md
index 205a47beb..9bf2cc357 100644
--- a/LANGUAGES.md
+++ b/LANGUAGES.md
@@ -244,7 +244,7 @@ The Language/Library Levels indicate the minimum and maximum versions that are u
<td align=left><a href="lib/ocaml/README.md">OCaml</a></td>
<!-- Since -----------------><td>0.2.0</td>
<!-- Build Systems ---------><td><img src="doc/images/cred.png" alt=""/></td><td><img src="doc/images/cred.png" alt=""/></td>
-<!-- Language Levels -------><td>4.02.3</td><td>4.04.0</td>
+<!-- Language Levels -------><td colspan=2>4.04.0</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/cred.png" alt=""/></td>
<!-- Transport Wrappers ----><td><img src="doc/images/cgrn.png" alt="Yes"/></td><td><img src="doc/images/cred.png" alt=""/></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/cred.png" alt=""/></td><td><img src="doc/images/cred.png" alt=""/></td><td><img src="doc/images/cred.png" alt=""/></td>
diff --git a/build/docker/README.md b/build/docker/README.md
index c2b203b3f..64a5ff8da 100644
--- a/build/docker/README.md
+++ b/build/docker/README.md
@@ -155,7 +155,7 @@ Last updated: October 1, 2017
| js | | | Unsure how to look for version info? |
| lua | 5.2.4 | 5.2.4 | Lua 5.3: see THRIFT-4386 |
| nodejs | 6.13.0 | 8.9.4 | |
-| ocaml | 4.02.3 | 4.04.0 | |
+| ocaml | | 4.04.0 | THRIFT-4517: ocaml 4.02.3 on xenial appears broken |
| perl | 5.22.1 | 5.26.0 | |
| php | 7.0.22 | 7.1.11 | |
| python | 2.7.12 | 2.7.14 | |
diff --git a/build/docker/ubuntu-xenial/Dockerfile b/build/docker/ubuntu-xenial/Dockerfile
index 832542ee7..ec2c849af 100644
--- a/build/docker/ubuntu-xenial/Dockerfile
+++ b/build/docker/ubuntu-xenial/Dockerfile
@@ -18,6 +18,7 @@
# - dotnet: does not come with Ubuntu
# - go: Xenial comes with 1.6, but we need 1.7 or later
# - nodejs: Xenial comes with 4.2.6 which exits LTS April 2018, so we're installing 6.x
+# - ocaml: causes stack overflow error, just started March 2018 not sure why
#
FROM buildpack-deps:xenial-scm
@@ -183,12 +184,13 @@ RUN apt-get install -y --no-install-recommends \
`# Node.js dependencies` \
nodejs
-RUN apt-get install -y --no-install-recommends \
-`# OCaml dependencies` \
- ocaml \
- opam && \
- opam init --yes && \
- opam install --yes oasis
+# THRIFT-4517: causes stack overflows; version too old; skip ocaml in xenial
+# RUN apt-get install -y --no-install-recommends \
+# `# OCaml dependencies` \
+# ocaml \
+# opam && \
+# opam init --yes && \
+# opam install --yes oasis
RUN apt-get install -y --no-install-recommends \
`# Perl dependencies` \