Skip to content

Commit 8cd87d5

Browse files
authored
Update Ubuntu 24.04 CI dockerfile to not install Ubuntu 22.04 swift
1 parent 88941f8 commit 8cd87d5

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

swift-ci/master/ubuntu/24.04/Dockerfile

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,25 +55,25 @@ RUN set -e; \
5555
;; \
5656
*) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \
5757
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" \
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" \
6161
# - 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/* \
62+
# && export DEBIAN_FRONTEND=noninteractive \
63+
# && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
6464
# - 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 \
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 \
6969
# - 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
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
7575

76-
ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
76+
# ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}"
7777

7878
USER build-user
7979

0 commit comments

Comments
 (0)