diff options
| author | Allen George <allen.george@gmail.com> | 2020-03-29 11:48:55 -0400 |
|---|---|---|
| committer | Jens Geyer <jensg@apache.org> | 2020-09-02 09:03:40 +0200 |
| commit | b0d14133d5071370905a1b54b37a1a7c86d50e6d (patch) | |
| tree | 517583f4bb61da82195f237c3663cac3f259e1bc /build | |
| parent | 935770c6b077fd96430684049078bdb9bdff50c5 (diff) | |
| download | thrift-b0d14133d5071370905a1b54b37a1a7c86d50e6d.tar.gz | |
THRIFT-5158 Update Rust generator and Rust lib,test,tutorial to only support 2018 edition
Client: rs
Patch: Allen George
This closes #2078
Diffstat (limited to 'build')
| -rw-r--r-- | build/docker/README.md | 2 | ||||
| -rw-r--r-- | build/docker/ubuntu-bionic/Dockerfile | 4 | ||||
| -rw-r--r-- | build/docker/ubuntu-disco/Dockerfile | 2 | ||||
| -rw-r--r-- | build/docker/ubuntu-xenial/Dockerfile | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/build/docker/README.md b/build/docker/README.md index 6f170e104..e3c2ec169 100644 --- a/build/docker/README.md +++ b/build/docker/README.md @@ -192,6 +192,6 @@ Last updated: October 1, 2017 | python | 2.7.12 | 2.7.15 | | | python3 | 3.5.2 | 3.6.8 | | | ruby | 2.3.1p112 | 2.5.1p57 | | -| rust | 1.34.0 | 1.35.0 | | +| rust | 1.40.0 | 1.40.0 | | | smalltalk | | | Not in CI | | swift | | 5.1.4 | | diff --git a/build/docker/ubuntu-bionic/Dockerfile b/build/docker/ubuntu-bionic/Dockerfile index c22a859df..7deefcb8f 100644 --- a/build/docker/ubuntu-bionic/Dockerfile +++ b/build/docker/ubuntu-bionic/Dockerfile @@ -23,7 +23,7 @@ ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && \ apt-get dist-upgrade -y && \ - apt-get install -y --no-install-recommends \ + apt-get install -y --no-install-recommends --fix-missing \ apt \ apt-transport-https \ apt-utils \ @@ -247,7 +247,7 @@ RUN apt-get install -y --no-install-recommends \ ruby-bundler # Rust dependencies -RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.36.0 -y +RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.40.0 -y ENV PATH /root/.cargo/bin:$PATH # Swift on Linux for cross tests diff --git a/build/docker/ubuntu-disco/Dockerfile b/build/docker/ubuntu-disco/Dockerfile index 247bcf15a..cfa40413e 100644 --- a/build/docker/ubuntu-disco/Dockerfile +++ b/build/docker/ubuntu-disco/Dockerfile @@ -248,7 +248,7 @@ RUN apt-get install -y --no-install-recommends \ ruby-bundler # Rust dependencies -RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.35.0 -y +RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.40.0 -y ENV PATH /root/.cargo/bin:$PATH # Swift on Linux for cross tests diff --git a/build/docker/ubuntu-xenial/Dockerfile b/build/docker/ubuntu-xenial/Dockerfile index 315b29865..535db419f 100644 --- a/build/docker/ubuntu-xenial/Dockerfile +++ b/build/docker/ubuntu-xenial/Dockerfile @@ -253,7 +253,7 @@ RUN apt-get install -y --no-install-recommends \ ruby-bundler # Rust dependencies -RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.34.0 -y +RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.40.0 -y # Clean up RUN rm -rf /var/cache/apt/* && \ |