diff options
| author | James Lacey <jamlacey@gmail.com> | 2021-03-26 11:38:38 -0700 |
|---|---|---|
| committer | Jens Geyer <jensg@apache.org> | 2021-03-27 11:17:55 +0100 |
| commit | 7054b315f4fc84d95461268a5e47b67f4ff6801d (patch) | |
| tree | 063a5a556b112d376c83cde37709b0ccab6333c8 /build | |
| parent | 7f1fc276d476c79e3e4fcadc26a9b0533b63624c (diff) | |
| download | thrift-7054b315f4fc84d95461268a5e47b67f4ff6801d.tar.gz | |
THRIFT-4303 Update ubuntu-xenial to use D 2.087.0
Client: d
Patch: James Lacey
This closes #2363
Diffstat (limited to 'build')
| -rw-r--r-- | build/docker/README.md | 2 | ||||
| -rw-r--r-- | build/docker/ubuntu-xenial/Dockerfile | 41 |
2 files changed, 17 insertions, 26 deletions
diff --git a/build/docker/README.md b/build/docker/README.md index 44e30b0fa..127de8e1e 100644 --- a/build/docker/README.md +++ b/build/docker/README.md @@ -174,7 +174,7 @@ Last updated: October 1, 2017 | C# (mono) | 4.2.1.0 | 4.6.2.7 | | | c_glib | 2.48.2 | 2.56.4 | | | cl (sbcl) | | 1.5.3 | | -| d | 2.075.1 | 2.087.0 | | +| d | 2.087.0 | 2.087.0 | | | dart | 2.0.0 | 2.4.0 | | | delphi | | | Not in CI | | erlang | 18.3 | 22.0 | | diff --git a/build/docker/ubuntu-xenial/Dockerfile b/build/docker/ubuntu-xenial/Dockerfile index 118445885..c0f42c739 100644 --- a/build/docker/ubuntu-xenial/Dockerfile +++ b/build/docker/ubuntu-xenial/Dockerfile @@ -13,7 +13,7 @@ # # Apache Thrift Docker build environment for Ubuntu Xenial # Using all stock Ubuntu Xenial packaging except for: -# - d: does not come with Ubuntu so we're installing 2.075.1 for coverage +# - d: does not come with Ubuntu so we're installing 2.087.0 for coverage # - dart: does not come with Ubuntu so we're installing 2.0.0-1 for coverage # - dotnet: does not come with Ubuntu # - go: Xenial comes with 1.6, but we need 1.10 or later @@ -37,11 +37,6 @@ RUN apt-get update && \ software-properties-common \ wget && \ -# D - 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 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 > \ @@ -93,26 +88,22 @@ RUN apt-get install -y --no-install-recommends \ qtbase5-dev \ qtbase5-dev-tools -ENV D_VERSION 2.075.1-0 -RUN apt-get install -y --allow-unauthenticated --no-install-recommends \ +ENV D_VERSION 2.087.0 +ENV DMD_DEB dmd_2.087.0-0_amd64.deb +RUN \ `# D dependencies` \ - dmd-bin=$D_VERSION \ - libphobos2-dev=$D_VERSION \ - dub=1.6.0-0 \ - dfmt \ - dscanner \ - libevent-dev \ - libssl-dev \ - xdg-utils -RUN 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/v1.1.6+1.0.1g.tar.gz | tar xz && \ - mv openssl-1.1.6-1.0.1g/deimos/* /usr/include/dmd/druntime/import/deimos/ && \ - mv openssl-1.1.6-1.0.1g/C/* /usr/include/dmd/druntime/import/C/ && \ - rm -rf openssl-1.1.6-1.0.1g + 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 && \ + git clone -b 'v2.0.2+2.0.16' https://github.com/D-Programming-Deimos/libevent.git deimos-libevent-2.0 && \ + mv deimos-libevent-2.0/deimos/* /usr/include/dmd/druntime/import/deimos/ && \ + mv deimos-libevent-2.0/C/* /usr/include/dmd/druntime/import/C/ && \ + rm -rf deimos-libevent-2.0 && \ + git clone -b 'v1.1.6+1.0.1g' https://github.com/D-Programming-Deimos/openssl.git deimos-openssl-1.0.1g && \ + mv deimos-openssl-1.0.1g/deimos/* /usr/include/dmd/druntime/import/deimos/ && \ + mv deimos-openssl-1.0.1g/C/* /usr/include/dmd/druntime/import/C/ && \ + rm -rf deimos-openssl-1.0.1g ENV DART_VERSION 2.7.2-1 RUN apt-get install -y --no-install-recommends \ |