Skip to content

Commit 62b0e7c

Browse files
authored
Remove the commented out lines from Swift CI Ubuntu 24.04 Dockerfile
1 parent 8cd87d5 commit 62b0e7c

File tree

1 file changed

+0
-46
lines changed

1 file changed

+0
-46
lines changed

swift-ci/master/ubuntu/24.04/Dockerfile

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -29,52 +29,6 @@ RUN apt-get -y update && apt-get -y install \
2929
uuid-dev \
3030
zip
3131

32-
ARG SWIFT_PLATFORM=ubuntu22.04
33-
ARG SWIFT_VERSION=5.8.1
34-
ARG SWIFT_BRANCH=swift-${SWIFT_VERSION}-release
35-
ARG SWIFT_TAG=swift-${SWIFT_VERSION}-RELEASE
36-
ARG SWIFT_WEBROOT=https://download.swift.org
37-
ARG SWIFT_PREFIX=/opt/swift/${SWIFT_VERSION}
38-
39-
ENV SWIFT_PLATFORM=$SWIFT_PLATFORM \
40-
SWIFT_VERSION=$SWIFT_VERSION \
41-
SWIFT_BRANCH=$SWIFT_BRANCH \
42-
SWIFT_TAG=$SWIFT_TAG \
43-
SWIFT_WEBROOT=$SWIFT_WEBROOT \
44-
SWIFT_PREFIX=$SWIFT_PREFIX
45-
46-
RUN set -e; \
47-
ARCH_NAME="$(dpkg --print-architecture)"; \
48-
url=; \
49-
case "${ARCH_NAME##*-}" in \
50-
'amd64') \
51-
OS_ARCH_SUFFIX=''; \
52-
;; \
53-
'arm64') \
54-
OS_ARCH_SUFFIX='-aarch64'; \
55-
;; \
56-
*) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \
57-
esac; \
58-
# SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)$OS_ARCH_SUFFIX" \
59-
# && SWIFT_BIN_URL="$SWIFT_WEBDIR/$SWIFT_TAG/$SWIFT_TAG-$SWIFT_PLATFORM$OS_ARCH_SUFFIX.tar.gz" \
60-
# && SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
61-
# - Grab curl here so we cache better up above
62-
# && export DEBIAN_FRONTEND=noninteractive \
63-
# && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
64-
# - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
65-
# && export GNUPGHOME="$(mktemp -d)" \
66-
# && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
67-
# && curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \
68-
# && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
69-
# - Unpack the toolchain, set libs permissions, and clean up.
70-
# && mkdir -p $SWIFT_PREFIX \
71-
# && tar -xzf swift.tar.gz --directory $SWIFT_PREFIX --strip-components=1 \
72-
# && chmod -R o+r $SWIFT_PREFIX/usr/lib/swift \
73-
# && rm -rf "$GNUPGHOME" swift.tar.gz.sig swift.tar.gz \
74-
# && apt-get purge --auto-remove -y curl
75-
76-
# ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
77-
7832
USER build-user
7933

8034
WORKDIR /home/build-user

0 commit comments

Comments
 (0)