diff options
| author | Kino Roy <kinoroy@users.noreply.github.com> | 2022-11-19 22:52:04 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-20 14:52:04 +0800 |
| commit | c49544802442100bd6fca47f38da1c228baad524 (patch) | |
| tree | 99eea3af40909058fc88b4b474960021e95c6485 | |
| parent | 8cf48c93502da263ade39711bf3f1e9f5bb6bbf1 (diff) | |
| download | thrift-c49544802442100bd6fca47f38da1c228baad524.tar.gz | |
THRIFT-5657: Use Swift 5.7 in travis build (#2719)
| -rw-r--r-- | LANGUAGES.md | 2 | ||||
| -rw-r--r-- | build/docker/ubuntu-bionic/Dockerfile | 11 | ||||
| -rw-r--r-- | build/docker/ubuntu-focal/Dockerfile | 11 | ||||
| -rw-r--r-- | build/docker/ubuntu-jammy/Dockerfile | 9 |
4 files changed, 21 insertions, 12 deletions
diff --git a/LANGUAGES.md b/LANGUAGES.md index e366f98a8..80c7c7739 100644 --- a/LANGUAGES.md +++ b/LANGUAGES.md @@ -343,7 +343,7 @@ Thrift's core protocol is TBinary, supported by all languages except for JavaScr <td align=left><a href="https://github.com/apache/thrift/blob/master/lib/swift/README.md">Swift</a></td> <!-- Since -----------------><td>0.12.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 colspan=2>4.2.1</td> +<!-- Language Levels -------><td colspan=2>5.7</td> <!-- Field types -----------><td><img src="/doc/images/cred.png" alt=""/></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/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/cred.png" alt=""/></td><td><img src="/doc/images/cgrn.png" alt="Yes"/></td><td><img src="/doc/images/cred.png" alt=""/></td> diff --git a/build/docker/ubuntu-bionic/Dockerfile b/build/docker/ubuntu-bionic/Dockerfile index 5d5f7ca72..e8f8b24bf 100644 --- a/build/docker/ubuntu-bionic/Dockerfile +++ b/build/docker/ubuntu-bionic/Dockerfile @@ -264,10 +264,13 @@ RUN apt-get install -yq \ libpython-dev \ libxml2-dev && \ cd / && \ - wget --quiet https://swift.org/builds/swift-5.1.4-release/ubuntu1804/swift-5.1.4-RELEASE/swift-5.1.4-RELEASE-ubuntu18.04.tar.gz && \ - tar xf swift-5.1.4-RELEASE-ubuntu18.04.tar.gz --strip-components=1 && \ - rm swift-5.1.4-RELEASE-ubuntu18.04.tar.gz && \ - swift --version + wget --quiet https://download.swift.org/swift-5.7-release/ubuntu1804/swift-5.7-RELEASE/swift-5.7-RELEASE-ubuntu18.04.tar.gz && \ + tar xf swift-5.7-RELEASE-ubuntu18.04.tar.gz && \ + mv swift-5.7-RELEASE-ubuntu18.04 /usr/share/swift && \ + rm swift-5.7-RELEASE-ubuntu18.04.tar.gz + +ENV PATH /usr/share/swift/usr/bin:$PATH +RUN swift --version # Locale(s) for cpp unit tests RUN apt-get install -y --no-install-recommends \ diff --git a/build/docker/ubuntu-focal/Dockerfile b/build/docker/ubuntu-focal/Dockerfile index 52f24636f..035c9645b 100644 --- a/build/docker/ubuntu-focal/Dockerfile +++ b/build/docker/ubuntu-focal/Dockerfile @@ -251,10 +251,13 @@ RUN apt-get install -yq \ libpython2-dev \ libxml2-dev && \ cd / && \ - wget --quiet https://swift.org/builds/swift-5.3.3-release/ubuntu2004/swift-5.3.3-RELEASE/swift-5.3.3-RELEASE-ubuntu20.04.tar.gz && \ - tar xf swift-5.3.3-RELEASE-ubuntu20.04.tar.gz --strip-components=1 && \ - rm swift-5.3.3-RELEASE-ubuntu20.04.tar.gz && \ - swift --version + wget --quiet https://download.swift.org/swift-5.7-release/ubuntu2004/swift-5.7-RELEASE/swift-5.7-RELEASE-ubuntu20.04.tar.gz && \ + tar xf swift-5.7-RELEASE-ubuntu20.04.tar.gz && \ + mv swift-5.7-RELEASE-ubuntu20.04 /usr/share/swift && \ + rm swift-5.7-RELEASE-ubuntu20.04.tar.gz + +ENV PATH /usr/share/swift/usr/bin:$PATH +RUN swift --version # Locale(s) for cpp unit tests RUN apt-get install -y --no-install-recommends \ diff --git a/build/docker/ubuntu-jammy/Dockerfile b/build/docker/ubuntu-jammy/Dockerfile index 9fd0db394..f6b7d041c 100644 --- a/build/docker/ubuntu-jammy/Dockerfile +++ b/build/docker/ubuntu-jammy/Dockerfile @@ -252,9 +252,12 @@ RUN apt-get install -yq \ libxml2-dev && \ cd / && \ wget --quiet https://download.swift.org/swift-5.7-release/ubuntu2204/swift-5.7-RELEASE/swift-5.7-RELEASE-ubuntu22.04.tar.gz && \ - tar xf swift-5.7-RELEASE-ubuntu22.04.tar.gz --strip-components=1 && \ - rm swift-5.7-RELEASE-ubuntu22.04.tar.gz && \ - swift --version + tar xf swift-5.7-RELEASE-ubuntu22.04.tar.gz && \ + mv swift-5.7-RELEASE-ubuntu22.04 /usr/share/swift && \ + rm swift-5.7-RELEASE-ubuntu22.04.tar.gz + +ENV PATH /usr/share/swift/usr/bin:$PATH +RUN swift --version # Locale(s) for cpp unit tests RUN apt-get install -y --no-install-recommends \ |