You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by jk...@apache.org on 2018/03/02 18:48:34 UTC
[3/3] thrift git commit: THRIFT-82: follow-up to common lisp to
stabilize the linux build environment and update some docs
THRIFT-82: follow-up to common lisp to stabilize the linux build environment and update some docs
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/bf7f76bb
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/bf7f76bb
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/bf7f76bb
Branch: refs/heads/master
Commit: bf7f76bb1f1864fdbbf30ac50715920afbc4a91d
Parents: e93a901
Author: James E. King III <jk...@apache.org>
Authored: Wed Feb 28 17:11:05 2018 -0500
Committer: James E. King III <jk...@apache.org>
Committed: Fri Mar 2 13:48:08 2018 -0500
----------------------------------------------------------------------
.travis.yml | 21 +++++++-------
LANGUAGES.md | 6 ++--
build/docker/README.md | 4 +--
build/docker/ubuntu-artful/Dockerfile | 44 ++++++++++++++----------------
test/known_failures_Linux.json | 2 ++
5 files changed, 37 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/bf7f76bb/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 9735f43..4eb2924 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,6 @@ install:
- if [[ `uname` == "Linux" ]]; then build/docker/refresh.sh; fi
stages:
-# - osx # up front for now (for testing)
- docker # docker images
- thrift # thrift build jobs
@@ -44,7 +43,7 @@ env:
- SCRIPT="cmake.sh"
- BUILD_ARG=""
- BUILD_ENV="-e CC=gcc -e CXX=g++ -e THRIFT_CROSSTEST_CONCURRENCY=4"
- - DISTRO=ubuntu-xenial
+ - DISTRO=ubuntu-artful
- BUILD_LIBS="CPP C_GLIB HASKELL JAVA PYTHON TESTING TUTORIALS" # only meaningful for CMake builds
- TRAVIS_BUILD_STAGE=test
# DOCKER_REPO (this works for all builds as a source for docker images - you can override for fork builds in your Travis settings)
@@ -54,12 +53,6 @@ env:
jobs:
include:
- # ------------------------- phase: osx --------------------------
- # - stage: osx
- # os: osx
- # osx_image: xcode9
- # script: build/docker/scripts/autotools.sh
-
# ========================= stage: docker =========================
- stage: docker
script: true
@@ -120,7 +113,6 @@ jobs:
env:
- JOB="Static Code Analysis"
- SCRIPT="sca.sh"
- - DISTRO=ubuntu-artful
# C and C++ undefined behavior.
# A binary crashes if undefined behavior occurs and produces a stack trace.
@@ -129,13 +121,12 @@ jobs:
env:
- JOB="UBSan"
- SCRIPT="ubsan.sh"
- - DISTRO=ubuntu-artful
- BUILD_ARG="--without-python --without-py3"
# ------------------------- phase: cmake ------------------------
- script: build/docker/run.sh
env:
- - JOB="CMake (Ubuntu Xenial)"
+ - JOB="CMake"
# C++ specific options: compiler plug-in, threading model
- script: build/docker/run.sh
@@ -178,10 +169,18 @@ jobs:
- script: build/docker/run.sh
env:
- JOB="make dist"
+ - DISTRO=ubuntu-xenial
- SCRIPT="make-dist.sh"
- script: build/docker/run.sh
env:
- JOB="Debian Packages"
+ - DISTRO=ubuntu-xenial
- SCRIPT="dpkg.sh"
+ ### ------------------------- phase: osx -------------------------
+ # disabled due to the time delays it imposes on build jobs
+ # - os: osx
+ # osx_image: xcode9
+ # script: build/docker/scripts/autotools.sh
+
http://git-wip-us.apache.org/repos/asf/thrift/blob/bf7f76bb/LANGUAGES.md
----------------------------------------------------------------------
diff --git a/LANGUAGES.md b/LANGUAGES.md
index 348b5ea..1b5fd51 100644
--- a/LANGUAGES.md
+++ b/LANGUAGES.md
@@ -84,15 +84,15 @@ The Language/Library Levels indicate the minimum and maximum versions that are u
<tr align=center>
<td align=left><a href="lib/cl/README.md">Common Lisp</a></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 colspan=2>unknown</td>
+<!-- Language Levels -------><td colspan=2>SBCL 1.4.4</td>
<!-- Low-Level Transports --><td><img src="doc/images/cred.png" alt=""/></td><td><img src="doc/images/cred.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/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="Yes"/></td><td><img src="doc/images/cred.png" alt=""/></td><td><img src="doc/images/cgrn.png" alt="Yes"/></td>
-<!-- Servers ---------------><td><img src="doc/images/cred.png" alt=""/></td><td><img src="doc/images/cred.png" alt="Yes"/></td><td><img src="doc/images/cgrn.png" alt=""/></td><td><img src="doc/images/cred.png" alt=""/></td><td></td>
+<!-- Servers ---------------><td><img src="doc/images/cred.png" alt=""/></td><td><img src="doc/images/cred.png" alt="Yes"/></td><td><img src="doc/images/cgrn.png" alt=""/></td><td><img src="doc/images/cred.png" alt=""/></td><td><img src="doc/images/cred.png" alt=""/></td>
<td align=left><a href="https://issues.apache.org/jira/browse/THRIFT-82">Common Lisp</a></td>
</tr>
<tr align=center>
-<td align=left><a href="lib/d/README.md">D</a></td>
+<td align=left><a href="lib/d/README.md">Dlang</a></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>2.070.2</td><td>2.077.1</td>
<!-- Low-Level Transports --><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><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>
http://git-wip-us.apache.org/repos/asf/thrift/blob/bf7f76bb/build/docker/README.md
----------------------------------------------------------------------
diff --git a/build/docker/README.md b/build/docker/README.md
index 28d5b16..35943e1 100644
--- a/build/docker/README.md
+++ b/build/docker/README.md
@@ -136,13 +136,13 @@ Last updated: October 1, 2017
| Language | ubuntu-trusty | ubuntu-xenial | ubuntu-artful | Notes |
| :-------- | :------------ | :------------ | :------------ | :---- |
-| as of | Oct 01, 2017 | Jan 29, 2018 | Jan 29, 2018 | |
+| as of | Oct 01, 2017 | Jan 29, 2018 | Mar 02, 2018 | |
| as3 | | | | Not in CI |
| C++ gcc | 4.8.4 | 5.4.0 | 7.2.0 | |
| C++ clang | 3.4 | 3.8 | 4.0 | |
| C# (mono) | 3.2.8.0 | 4.2.1.0 | 4.6.2.7 | |
| c_glib | 2.40.2 | 2.48.2 | 2.54.0 | |
-| CL (sbcl) | | | 1.3.14 | |
+| CL (sbcl) | | | 1.4.4 | |
| cocoa | | | | Not in CI |
| d | 2.070.2 | 2.073.2 | 2.077.1 | |
| dart | 1.20.1 | 1.22.1 | 1.24.3 | |
http://git-wip-us.apache.org/repos/asf/thrift/blob/bf7f76bb/build/docker/ubuntu-artful/Dockerfile
----------------------------------------------------------------------
diff --git a/build/docker/ubuntu-artful/Dockerfile b/build/docker/ubuntu-artful/Dockerfile
index b9c30f6..fe241c4 100644
--- a/build/docker/ubuntu-artful/Dockerfile
+++ b/build/docker/ubuntu-artful/Dockerfile
@@ -41,11 +41,6 @@ RUN apt-get update && \
# RUN echo "deb http://download.mono-project.com/repo/debian xenial main" | tee /etc/apt/sources.list.d/mono.list && \
# apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A6A19B38D3D831EF
-# D
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EBCF975E5BA24D5E && \
- wget http://master.dl.sourceforge.net/project/d-apt/files/d-apt.list -O /etc/apt/sources.list.d/d-apt.list && \
- wget -qO - https://dlang.org/d-keyring.gpg | apt-key add -
-
# Dart
RUN curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
curl https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > \
@@ -95,29 +90,30 @@ RUN apt-get install -y --no-install-recommends \
`# csharp (mono) dependencies` \
mono-devel
-ENV D_VERSION 2.077.1-0.1
-RUN apt-get install -y --no-install-recommends \
+ENV SBCL_VERSION 1.4.4
+RUN \
`# Common Lisp (sbcl) dependencies` \
- sbcl
-
-RUN apt-get install -y --no-install-recommends \
- `# D dependencies` \
- dmd-bin=$D_VERSION \
- libphobos2-dev=$D_VERSION \
- dmd-compiler=$D_VERSION \
- dmd-tools=$D_VERSION \
- dub \
- dfmt \
- dscanner \
- libevent-dev \
- libssl-dev \
- xdg-utils
-RUN mkdir -p /usr/include/dmd/druntime/import/deimos /usr/include/dmd/druntime/import/C && \
+ curl --version && \
+ curl -O -J -L https://kent.dl.sourceforge.net/project/sbcl/sbcl/${SBCL_VERSION}/sbcl-${SBCL_VERSION}-x86-64-linux-binary.tar.bz2 && \
+ tar xjf sbcl-${SBCL_VERSION}-x86-64-linux-binary.tar.bz2 && \
+ cd sbcl-${SBCL_VERSION}-x86-64-linux && \
+ ./install.sh && \
+ sbcl --version && \
+ rm -rf sbcl*
+
+ENV D_VERSION 2.077.1
+ENV DMD_DEB dmd_2.077.1-0_amd64.deb
+RUN \
+`# D dependencies` \
+ wget -q http://downloads.dlang.org/releases/2.x/${D_VERSION}/${DMD_DEB} && \
+ dpkg --install ${DMD_DEB} && \
+ rm -f ${DMD_DEB} && \
+ mkdir -p /usr/include/dmd/druntime/import/deimos /usr/include/dmd/druntime/import/C && \
curl -sSL https://github.com/D-Programming-Deimos/libevent/archive/master.tar.gz| tar xz && \
mv libevent-master/deimos/* /usr/include/dmd/druntime/import/deimos/ && \
mv libevent-master/C/* /usr/include/dmd/druntime/import/C/ && \
- rm -rf libevent-master
-RUN curl -sSL https://github.com/D-Programming-Deimos/openssl/archive/master.tar.gz| tar xz && \
+ rm -rf libevent-master && \
+ curl -sSL https://github.com/D-Programming-Deimos/openssl/archive/master.tar.gz| tar xz && \
mv openssl-master/deimos/* /usr/include/dmd/druntime/import/deimos/ && \
mv openssl-master/C/* /usr/include/dmd/druntime/import/C/ && \
rm -rf openssl-master
http://git-wip-us.apache.org/repos/asf/thrift/blob/bf7f76bb/test/known_failures_Linux.json
----------------------------------------------------------------------
diff --git a/test/known_failures_Linux.json b/test/known_failures_Linux.json
index 082496d..a0bd542 100644
--- a/test/known_failures_Linux.json
+++ b/test/known_failures_Linux.json
@@ -98,6 +98,8 @@
"csharp-erl_binary_framed-ip-ssl",
"csharp-erl_compact_buffered-ip-ssl",
"csharp-erl_compact_framed-ip-ssl",
+ "d-cl_binary_buffered-ip",
+ "d-cl_binary_framed-ip",
"d-cpp_binary_buffered-ip",
"d-cpp_binary_buffered-ip-ssl",
"d-cpp_binary_framed-ip",