Skip to content

Commit 5f9dab4

Browse files
marcpruxmarcprux
authored
Merge branch 'swiftlang:main' into main
2 parents 6565052 + a79e8eb commit 5f9dab4

File tree

42 files changed

+1863
-22
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1863
-22
lines changed

‎nightly-6.1/amazonlinux/2/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ RUN set -e; \
5353
&& export GNUPGHOME="$(mktemp -d)" \
5454
&& curl -fsSL ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \
5555
${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \
56-
&& curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \
56+
&& curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \
5757
&& gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \
5858
# - Unpack the toolchain, set libs permissions, and clean up.
5959
&& tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \

‎nightly-6.1/amazonlinux/2/buildx/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ RUN set -e; \
5959
&& export GNUPGHOME="$(mktemp -d)" \
6060
&& curl -fsSL ${PLATFORM_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \
6161
${PLATFORM_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \
62-
&& curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \
62+
&& curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \
6363
&& gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \
6464
# - Unpack the toolchain, set libs permissions, and clean up.
6565
&& tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \

‎nightly-6.1/amazonlinux/2/slim/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ LABEL maintainer="Swift Infrastructure <[email protected]>"
33
LABEL description="Docker Container for the Swift programming language"
44

55
# Everything up to here should cache nicely between Swift versions, assuming dev dependencies change little
6-
76
# gpg --keyid-format LONG -k F167DF1ACF9CE069
87
# pub rsa4096/F167DF1ACF9CE069 2021-11-08 [SC] [expires: 2025-11-09]
98
# E813C892820A6FA13755B268F167DF1ACF9CE069
@@ -31,7 +30,7 @@ RUN set -e; \
3130
&& export GNUPGHOME="$(mktemp -d)" \
3231
&& curl -fsSL ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \
3332
${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \
34-
&& curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \
33+
&& curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \
3534
&& gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \
3635
# - Unpack the toolchain, set libs permissions, and clean up.
3736
&& yum -y install tar gzip \

‎nightly-6.1/debian/12/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ RUN set -e; \
5656
&& export GNUPGHOME="$(mktemp -d)" \
5757
&& curl -fsSL ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \
5858
${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz.sig \
59-
&& curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \
59+
&& curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \
6060
# - Unpack the toolchain, set libs permissions, and clean up.
6161
&& mkdir -p $SWIFT_PREFIX \
6262
&& tar -xzf latest_toolchain.tar.gz --directory $SWIFT_PREFIX --strip-components=1 \

‎nightly-6.1/debian/12/buildx/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ RUN set -e; \
6666
&& export GNUPGHOME="$(mktemp -d)" \
6767
&& curl -fsSL ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \
6868
${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz.sig \
69-
&& curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \
69+
&& curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \
7070
# - Unpack the toolchain, set libs permissions, and clean up.
7171
&& mkdir -p $SWIFT_PREFIX \
7272
&& tar -xzf latest_toolchain.tar.gz --directory $SWIFT_PREFIX --strip-components=1 \

‎nightly-6.1/fedora/39/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ RUN set -e; \
5858
&& export GNUPGHOME="$(mktemp -d)" \
5959
&& curl -fsSL ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \
6060
${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz.sig \
61-
&& curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \
61+
&& curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \
6262
# - Unpack the toolchain, set libs permissions, and clean up.
6363
&& mkdir -p $SWIFT_PREFIX \
6464
&& tar -xzf latest_toolchain.tar.gz --directory $SWIFT_PREFIX --strip-components=1 \
@@ -72,4 +72,4 @@ USER build-user
7272
WORKDIR /home/build-user
7373

7474
# Print Installed Swift Version
75-
RUN swift --version
75+
RUN swift --version

‎nightly-6.1/fedora/39/buildx/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ RUN set -e; \
6868
&& export GNUPGHOME="$(mktemp -d)" \
6969
&& curl -fsSL ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \
7070
${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz.sig \
71-
&& curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \
71+
&& curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \
7272
# - Unpack the toolchain, set libs permissions, and clean up.
7373
&& mkdir -p $SWIFT_PREFIX \
7474
&& tar -xzf latest_toolchain.tar.gz --directory $SWIFT_PREFIX --strip-components=1 \
@@ -82,4 +82,4 @@ USER build-user
8282
WORKDIR /home/build-user
8383

8484
# Print Installed Swift Version
85-
RUN swift --version
85+
RUN swift --version

‎nightly-6.1/rhel-ubi/9/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ RUN set -e; \
4646
&& export GNUPGHOME="$(mktemp -d)" \
4747
&& curl -fL ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \
4848
${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \
49-
&& curl -fL https://swift.org/keys/all-keys.asc | gpg --import - \
49+
&& curl -fL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \
5050
&& gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \
5151
# - Unpack the toolchain, set libs permissions, and clean up.
5252
&& tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \

‎nightly-6.1/rhel-ubi/9/buildx/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ RUN set -e; \
5252
&& export GNUPGHOME="$(mktemp -d)" \
5353
&& curl -fsSL ${PLATFORM_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \
5454
${PLATFORM_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \
55-
&& curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \
55+
&& curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \
5656
&& gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \
5757
# - Unpack the toolchain, set libs permissions, and clean up.
5858
&& tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \

‎nightly-6.1/rhel-ubi/9/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ RUN set -e; \
3131
&& export GNUPGHOME="$(mktemp -d)" \
3232
&& curl -fsSL ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \
3333
${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \
34-
&& curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \
34+
&& curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \
3535
&& gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \
3636
# - Unpack the toolchain, set libs permissions, and clean up.
3737
&& tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \

0 commit comments

Comments
 (0)