From c49544802442100bd6fca47f38da1c228baad524 Mon Sep 17 00:00:00 2001 From: Kino Roy Date: Sat, 19 Nov 2022 22:52:04 -0800 Subject: THRIFT-5657: Use Swift 5.7 in travis build (#2719) --- build/docker/ubuntu-bionic/Dockerfile | 11 +++++++---- build/docker/ubuntu-focal/Dockerfile | 11 +++++++---- build/docker/ubuntu-jammy/Dockerfile | 9 ++++++--- 3 files changed, 20 insertions(+), 11 deletions(-) (limited to 'build') 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 \ -- cgit v1.2.1