-
Notifications
You must be signed in to change notification settings - Fork 2.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Swift] Add support for Swift 5.5.3 #11842
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
So, unfortunately |
|
@yosifkit Reverted the CentOS 8 changes for now. |
Diff for 74ba807:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 80ee322..b83f560 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -182,50 +182,50 @@ Tags: 5.4.3-xenial-slim, 5.4-xenial-slim
GitCommit: 2d2c2fb89fe6ecfd8885157eb1666ed2686503a0
Directory: 5.4/ubuntu/16.04/slim
-Tags: 5.5.2, 5.5, 5.5.2-bionic, 5.5-bionic, bionic, latest
+Tags: 5.5.2-centos8, 5.5-centos8, centos8
GitCommit: ffca0bee2c784cdff103aac3b9101b7589ca9945
-Directory: 5.5/ubuntu/18.04
+Directory: 5.5/centos/8
-Tags: 5.5.2-amazonlinux2, 5.5-amazonlinux2, amazonlinux2
+Tags: 5.5.2-centos8-slim, 5.5-centos8-slim, centos8-slim
GitCommit: ffca0bee2c784cdff103aac3b9101b7589ca9945
+Directory: 5.5/centos/8/slim
+
+Tags: 5.5.3, 5.5, 5.5.3-bionic, 5.5-bionic, bionic, latest
+GitCommit: 9394b31e064cf0d80eaab08b692a2886c7aea8fe
+Directory: 5.5/ubuntu/18.04
+
+Tags: 5.5.3-amazonlinux2, 5.5-amazonlinux2, amazonlinux2
+GitCommit: 9394b31e064cf0d80eaab08b692a2886c7aea8fe
Directory: 5.5/amazonlinux/2
-Tags: 5.5.2-amazonlinux2-slim, 5.5-amazonlinux2-slim, amazonlinux2-slim
-GitCommit: ffca0bee2c784cdff103aac3b9101b7589ca9945
+Tags: 5.5.3-amazonlinux2-slim, 5.5-amazonlinux2-slim, amazonlinux2-slim
+GitCommit: 9394b31e064cf0d80eaab08b692a2886c7aea8fe
Directory: 5.5/amazonlinux/2/slim
-Tags: 5.5.2-centos7, 5.5-centos7, centos7
-GitCommit: ffca0bee2c784cdff103aac3b9101b7589ca9945
+Tags: 5.5.3-centos7, 5.5-centos7, centos7
+GitCommit: 9394b31e064cf0d80eaab08b692a2886c7aea8fe
Directory: 5.5/centos/7
-Tags: 5.5.2-centos7-slim, 5.5-centos7-slim, centos7-slim
-GitCommit: ffca0bee2c784cdff103aac3b9101b7589ca9945
+Tags: 5.5.3-centos7-slim, 5.5-centos7-slim, centos7-slim
+GitCommit: 9394b31e064cf0d80eaab08b692a2886c7aea8fe
Directory: 5.5/centos/7/slim
-Tags: 5.5.2-centos8, 5.5-centos8, centos8
-GitCommit: ffca0bee2c784cdff103aac3b9101b7589ca9945
-Directory: 5.5/centos/8
-
-Tags: 5.5.2-centos8-slim, 5.5-centos8-slim, centos8-slim
-GitCommit: ffca0bee2c784cdff103aac3b9101b7589ca9945
-Directory: 5.5/centos/8/slim
-
-Tags: 5.5.2-focal, 5.5-focal, focal
-GitCommit: ffca0bee2c784cdff103aac3b9101b7589ca9945
+Tags: 5.5.3-focal, 5.5-focal, focal
+GitCommit: 9394b31e064cf0d80eaab08b692a2886c7aea8fe
Directory: 5.5/ubuntu/20.04
-Tags: 5.5.2-focal-slim, 5.5-focal-slim, focal-slim
-GitCommit: ffca0bee2c784cdff103aac3b9101b7589ca9945
+Tags: 5.5.3-focal-slim, 5.5-focal-slim, focal-slim
+GitCommit: 9394b31e064cf0d80eaab08b692a2886c7aea8fe
Directory: 5.5/ubuntu/20.04/slim
-Tags: 5.5.2-slim, 5.5-slim, 5.5.2-bionic-slim, 5.5-bionic-slim, bionic-slim, slim
-GitCommit: ffca0bee2c784cdff103aac3b9101b7589ca9945
+Tags: 5.5.3-slim, 5.5-slim, 5.5.3-bionic-slim, 5.5-bionic-slim, bionic-slim, slim
+GitCommit: 9394b31e064cf0d80eaab08b692a2886c7aea8fe
Directory: 5.5/ubuntu/18.04/slim
-Tags: 5.5.2-xenial, 5.5-xenial, xenial
-GitCommit: ffca0bee2c784cdff103aac3b9101b7589ca9945
+Tags: 5.5.3-xenial, 5.5-xenial, xenial
+GitCommit: 9394b31e064cf0d80eaab08b692a2886c7aea8fe
Directory: 5.5/ubuntu/16.04
-Tags: 5.5.2-xenial-slim, 5.5-xenial-slim, xenial-slim
-GitCommit: ffca0bee2c784cdff103aac3b9101b7589ca9945
+Tags: 5.5.3-xenial-slim, 5.5-xenial-slim, xenial-slim
+GitCommit: 9394b31e064cf0d80eaab08b692a2886c7aea8fe
Directory: 5.5/ubuntu/16.04/slim
diff --git a/_bashbrew-list b/_bashbrew-list
index bde4c45..d22eef8 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -123,20 +123,20 @@ swift:5.5-focal-slim
swift:5.5-slim
swift:5.5-xenial
swift:5.5-xenial-slim
-swift:5.5.2
-swift:5.5.2-amazonlinux2
-swift:5.5.2-amazonlinux2-slim
-swift:5.5.2-bionic
-swift:5.5.2-bionic-slim
-swift:5.5.2-centos7
-swift:5.5.2-centos7-slim
swift:5.5.2-centos8
swift:5.5.2-centos8-slim
-swift:5.5.2-focal
-swift:5.5.2-focal-slim
-swift:5.5.2-slim
-swift:5.5.2-xenial
-swift:5.5.2-xenial-slim
+swift:5.5.3
+swift:5.5.3-amazonlinux2
+swift:5.5.3-amazonlinux2-slim
+swift:5.5.3-bionic
+swift:5.5.3-bionic-slim
+swift:5.5.3-centos7
+swift:5.5.3-centos7-slim
+swift:5.5.3-focal
+swift:5.5.3-focal-slim
+swift:5.5.3-slim
+swift:5.5.3-xenial
+swift:5.5.3-xenial-slim
swift:amazonlinux2
swift:amazonlinux2-slim
swift:bionic
diff --git a/swift_amazonlinux2-slim/Dockerfile b/swift_amazonlinux2-slim/Dockerfile
index ae1bbc3..9bc1881 100644
--- a/swift_amazonlinux2-slim/Dockerfile
+++ b/swift_amazonlinux2-slim/Dockerfile
@@ -9,8 +9,8 @@ LABEL description="Docker Container for the Swift programming language"
# uid Swift 5.x Release Signing Key <swift-infrastructure@swift.org
ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
ARG SWIFT_PLATFORM=amazonlinux2
-ARG SWIFT_BRANCH=swift-5.5.2-release
-ARG SWIFT_VERSION=swift-5.5.2-RELEASE
+ARG SWIFT_BRANCH=swift-5.5.3-release
+ARG SWIFT_VERSION=swift-5.5.3-RELEASE
ARG SWIFT_WEBROOT=https://download.swift.org
ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
diff --git a/swift_amazonlinux2/Dockerfile b/swift_amazonlinux2/Dockerfile
index eb11921..90ed325 100644
--- a/swift_amazonlinux2/Dockerfile
+++ b/swift_amazonlinux2/Dockerfile
@@ -9,13 +9,13 @@ RUN yum -y install \
glibc-static \
gzip \
libbsd \
- libcurl \
+ libcurl-devel \
libedit \
libicu \
libsqlite \
libstdc++-static \
libuuid \
- libxml2 \
+ libxml2-devel \
tar \
tzdata \
zlib-devel
@@ -27,8 +27,8 @@ RUN yum -y install \
# uid Swift 5.x Release Signing Key <swift-infrastructure@swift.org
ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
ARG SWIFT_PLATFORM=amazonlinux2
-ARG SWIFT_BRANCH=swift-5.5.2-release
-ARG SWIFT_VERSION=swift-5.5.2-RELEASE
+ARG SWIFT_BRANCH=swift-5.5.3-release
+ARG SWIFT_VERSION=swift-5.5.3-RELEASE
ARG SWIFT_WEBROOT=https://download.swift.org
ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
diff --git a/swift_centos7-slim/Dockerfile b/swift_centos7-slim/Dockerfile
index 5ce5e0c..2eba3e6 100644
--- a/swift_centos7-slim/Dockerfile
+++ b/swift_centos7-slim/Dockerfile
@@ -9,8 +9,8 @@ LABEL description="Docker Container for the Swift programming language"
# uid Swift 5.x Release Signing Key <swift-infrastructure@swift.org
ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
ARG SWIFT_PLATFORM=centos7
-ARG SWIFT_BRANCH=swift-5.5.2-release
-ARG SWIFT_VERSION=swift-5.5.2-RELEASE
+ARG SWIFT_BRANCH=swift-5.5.3-release
+ARG SWIFT_VERSION=swift-5.5.3-RELEASE
ARG SWIFT_WEBROOT=https://download.swift.org
ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
diff --git a/swift_centos7/Dockerfile b/swift_centos7/Dockerfile
index 2975296..b66c0f0 100644
--- a/swift_centos7/Dockerfile
+++ b/swift_centos7/Dockerfile
@@ -8,10 +8,12 @@ RUN yum install shadow-utils.x86_64 -y \
git \
glibc-static \
libbsd-devel \
+ libcurl-devel \
libedit \
libedit-devel \
libicu-devel \
libstdc++-static \
+ libxml2-devel \
pkg-config \
python3 \
sqlite \
@@ -26,8 +28,8 @@ RUN sed -i -e 's/\*__block/\*__libc_block/g' /usr/include/unistd.h
# uid Swift 5.x Release Signing Key <swift-infrastructure@swift.org
ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
ARG SWIFT_PLATFORM=centos7
-ARG SWIFT_BRANCH=swift-5.5.2-release
-ARG SWIFT_VERSION=swift-5.5.2-RELEASE
+ARG SWIFT_BRANCH=swift-5.5.3-release
+ARG SWIFT_VERSION=swift-5.5.3-RELEASE
ARG SWIFT_WEBROOT=https://download.swift.org
ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
diff --git a/swift_focal-slim/Dockerfile b/swift_focal-slim/Dockerfile
index af6d856..146a6fc 100644
--- a/swift_focal-slim/Dockerfile
+++ b/swift_focal-slim/Dockerfile
@@ -16,8 +16,8 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
# uid Swift 5.x Release Signing Key <swift-infrastructure@swift.org
ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
ARG SWIFT_PLATFORM=ubuntu20.04
-ARG SWIFT_BRANCH=swift-5.5.2-release
-ARG SWIFT_VERSION=swift-5.5.2-RELEASE
+ARG SWIFT_BRANCH=swift-5.5.3-release
+ARG SWIFT_VERSION=swift-5.5.3-RELEASE
ARG SWIFT_WEBROOT=https://download.swift.org
ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
diff --git a/swift_focal/Dockerfile b/swift_focal/Dockerfile
index 0a9ab7e..9a6adab 100644
--- a/swift_focal/Dockerfile
+++ b/swift_focal/Dockerfile
@@ -8,13 +8,13 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
git \
gnupg2 \
libc6-dev \
- libcurl4 \
+ libcurl4-openssl-dev \
libedit2 \
libgcc-9-dev \
libpython3.8 \
libsqlite3-0 \
libstdc++-9-dev \
- libxml2 \
+ libxml2-dev \
libz3-dev \
pkg-config \
tzdata \
@@ -28,8 +28,8 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
# uid Swift 5.x Release Signing Key <swift-infrastructure@swift.org
ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
ARG SWIFT_PLATFORM=ubuntu20.04
-ARG SWIFT_BRANCH=swift-5.5.2-release
-ARG SWIFT_VERSION=swift-5.5.2-RELEASE
+ARG SWIFT_BRANCH=swift-5.5.3-release
+ARG SWIFT_VERSION=swift-5.5.3-RELEASE
ARG SWIFT_WEBROOT=https://download.swift.org
ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
diff --git a/swift_latest/Dockerfile b/swift_latest/Dockerfile
index fe7e6ca..b1b90a6 100644
--- a/swift_latest/Dockerfile
+++ b/swift_latest/Dockerfile
@@ -5,8 +5,8 @@ LABEL Description="Docker Container for the Swift programming language"
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
apt-get -q install -y \
libatomic1 \
- libcurl4 \
- libxml2 \
+ libcurl4-openssl-dev \
+ libxml2-dev \
libedit2 \
libsqlite3-0 \
libc6-dev \
@@ -27,8 +27,8 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
# uid Swift 5.x Release Signing Key <swift-infrastructure@swift.org
ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
ARG SWIFT_PLATFORM=ubuntu18.04
-ARG SWIFT_BRANCH=swift-5.5.2-release
-ARG SWIFT_VERSION=swift-5.5.2-RELEASE
+ARG SWIFT_BRANCH=swift-5.5.3-release
+ARG SWIFT_VERSION=swift-5.5.3-RELEASE
ARG SWIFT_WEBROOT=https://download.swift.org
ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
diff --git a/swift_slim/Dockerfile b/swift_slim/Dockerfile
index f783e2d..185d19e 100644
--- a/swift_slim/Dockerfile
+++ b/swift_slim/Dockerfile
@@ -17,8 +17,8 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
# uid Swift 5.x Release Signing Key <swift-infrastructure@swift.org
ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
ARG SWIFT_PLATFORM=ubuntu18.04
-ARG SWIFT_BRANCH=swift-5.5.2-release
-ARG SWIFT_VERSION=swift-5.5.2-RELEASE
+ARG SWIFT_BRANCH=swift-5.5.3-release
+ARG SWIFT_VERSION=swift-5.5.3-RELEASE
ARG SWIFT_WEBROOT=https://download.swift.org
ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
diff --git a/swift_xenial-slim/Dockerfile b/swift_xenial-slim/Dockerfile
index a9e62bf..efa192f 100644
--- a/swift_xenial-slim/Dockerfile
+++ b/swift_xenial-slim/Dockerfile
@@ -17,8 +17,8 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
# uid Swift 5.x Release Signing Key <swift-infrastructure@swift.org
ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
ARG SWIFT_PLATFORM=ubuntu16.04
-ARG SWIFT_BRANCH=swift-5.5.2-release
-ARG SWIFT_VERSION=swift-5.5.2-RELEASE
+ARG SWIFT_BRANCH=swift-5.5.3-release
+ARG SWIFT_VERSION=swift-5.5.3-RELEASE
ARG SWIFT_WEBROOT=https://download.swift.org
ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
diff --git a/swift_xenial/Dockerfile b/swift_xenial/Dockerfile
index c17d069..a128335 100644
--- a/swift_xenial/Dockerfile
+++ b/swift_xenial/Dockerfile
@@ -5,8 +5,8 @@ LABEL Description="Docker Container for the Swift programming language"
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
apt-get -q install -y \
libatomic1 \
- libcurl3 \
- libxml2 \
+ libcurl3-openssl-dev \
+ libxml2-dev \
libedit2 \
libsqlite3-0 \
libc6-dev \
@@ -27,8 +27,8 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
# uid Swift 5.x Release Signing Key <swift-infrastructure@swift.org
ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
ARG SWIFT_PLATFORM=ubuntu16.04
-ARG SWIFT_BRANCH=swift-5.5.2-release
-ARG SWIFT_VERSION=swift-5.5.2-RELEASE
+ARG SWIFT_BRANCH=swift-5.5.3-release
+ARG SWIFT_VERSION=swift-5.5.3-RELEASE
ARG SWIFT_WEBROOT=https://download.swift.org
ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \Relevant Maintainers:
|
Closed
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.