Skip to content

Commit 62b1e50

Browse files
justice-adams-applejustice-adams-apple
authored
Update installed packages after nightly platform expansion (#458)
* update nightly-6.1 dependencies * update nightly-main dependencies * fix ubuntu images
1 parent fad056f commit 62b1e50

File tree

12 files changed

+146
-266
lines changed

12 files changed

+146
-266
lines changed

‎nightly-6.1/debian/12/Dockerfile‎

Lines changed: 20 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,25 @@ FROM debian:12
33
RUN groupadd -g 998 build-user && \
44
useradd -m -r -u 998 -g build-user build-user
55

6-
ENV DEBIAN_FRONTEND="noninteractive"
7-
8-
RUN apt-get -y update && apt-get -y install \
9-
build-essential \
10-
clang \
11-
cmake \
12-
diffutils \
13-
git \
14-
icu-devtools \
15-
libcurl4-openssl-dev \
16-
libedit-dev \
17-
libicu-dev \
18-
libncurses-dev \
19-
libpython3-dev \
20-
libsqlite3-dev \
21-
libxml2-dev \
22-
ninja-build \
23-
pkg-config \
24-
python3-distutils \
25-
python3-pip \
26-
python3-pkg-resources \
27-
python3-psutil \
28-
rsync \
29-
swig \
30-
systemtap-sdt-dev \
31-
tzdata \
32-
uuid-dev \
33-
zip \
34-
libstdc++-12-dev
6+
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
7+
apt-get -q install -y \
8+
binutils-gold \
9+
curl \
10+
gpg \
11+
libicu-dev \
12+
libcurl4-openssl-dev \
13+
libedit-dev \
14+
libsqlite3-dev \
15+
libncurses-dev \
16+
libpython3-dev \
17+
libxml2-dev \
18+
pkg-config \
19+
uuid-dev \
20+
tzdata \
21+
git \
22+
gcc \
23+
libstdc++-12-dev \
24+
&& rm -r /var/lib/apt/lists/*
3525

3626

3727
ARG SWIFT_SIGNING_KEY=E813C892820A6FA13755B268F167DF1ACF9CE069
@@ -46,9 +36,6 @@ ENV SWIFT_PLATFORM=$SWIFT_PLATFORM \
4636
SWIFT_WEBROOT=$SWIFT_WEBROOT \
4737
SWIFT_PREFIX=$SWIFT_PREFIX
4838

49-
COPY swift-ci/dependencies/requirements.txt /dependencies/
50-
RUN pip3 install -r /dependencies/requirements.txt --break-system-packages
51-
5239
RUN set -e; \
5340
ARCH_NAME="$(dpkg --print-architecture)"; \
5441
url=; \
@@ -61,10 +48,7 @@ RUN set -e; \
6148
;; \
6249
*) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \
6350
esac; \
64-
# - Grab curl here so we cache better up above
65-
export DEBIAN_FRONTEND=noninteractive \
66-
&& apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
67-
&& export $(curl -s ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \
51+
export $(curl -s ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \
6852
&& export $(curl -s ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g') \
6953
&& export DOWNLOAD_DIR=$(echo $download | sed "s/-${SWIFT_PLATFORM}${OS_ARCH_SUFFIX}.tar.gz//g") \
7054
&& echo $DOWNLOAD_DIR > .swift_tag \

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

Lines changed: 20 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,25 @@ FROM debian:12 as Base
33
RUN groupadd -g 998 build-user && \
44
useradd -m -r -u 998 -g build-user build-user
55

6-
ENV DEBIAN_FRONTEND="noninteractive"
7-
8-
RUN apt-get -y update && apt-get -y install \
9-
build-essential \
10-
clang \
11-
cmake \
12-
diffutils \
13-
git \
14-
icu-devtools \
15-
libcurl4-openssl-dev \
16-
libedit-dev \
17-
libicu-dev \
18-
libncurses-dev \
19-
libpython3-dev \
20-
libsqlite3-dev \
21-
libxml2-dev \
22-
ninja-build \
23-
pkg-config \
24-
python3-distutils \
25-
python3-pip \
26-
python3-pkg-resources \
27-
python3-psutil \
28-
rsync \
29-
swig \
30-
systemtap-sdt-dev \
31-
tzdata \
32-
uuid-dev \
33-
zip \
34-
libstdc++-12-dev
6+
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
7+
apt-get -q install -y \
8+
binutils-gold \
9+
curl \
10+
gpg \
11+
libicu-dev \
12+
libcurl4-openssl-dev \
13+
libedit-dev \
14+
libsqlite3-dev \
15+
libncurses-dev \
16+
libpython3-dev \
17+
libxml2-dev \
18+
pkg-config \
19+
uuid-dev \
20+
tzdata \
21+
git \
22+
gcc \
23+
libstdc++-12-dev \
24+
&& rm -r /var/lib/apt/lists/*
3525

3626

3727
ARG SWIFT_SIGNING_KEY=E813C892820A6FA13755B268F167DF1ACF9CE069
@@ -68,10 +58,7 @@ RUN set -e; \
6858
;; \
6959
*) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \
7060
esac; \
71-
# - Grab curl here so we cache better up above
72-
export DEBIAN_FRONTEND=noninteractive \
73-
&& apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
74-
&& export $(curl -s ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \
61+
export $(curl -s ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \
7562
&& export $(curl -s ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g') \
7663
&& export DOWNLOAD_DIR=$(echo $download | sed "s/-${SWIFT_PLATFORM}${OS_ARCH_SUFFIX}.tar.gz//g") \
7764
&& echo $DOWNLOAD_DIR > .swift_tag \

‎nightly-6.1/fedora/39/Dockerfile‎

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,19 @@ LABEL description="Docker Container for the Swift programming language"
55
RUN groupadd -g 998 build-user && \
66
useradd -m -r -u 998 -g build-user build-user
77

8-
RUN yum install -y \
9-
libcurl-devel \
10-
libedit-devel \
11-
libicu-devel \
12-
sqlite-devel \
13-
libuuid-devel \
14-
libxml2-devel \
15-
python3 \
16-
python3-pip \
17-
python3-devel \
18-
python3-distro \
19-
python3-setuptools \
20-
python3-six \
21-
rsync \
22-
swig \
23-
clang \
24-
perl-podlators \
25-
which \
26-
git \
27-
cmake \
28-
zip \
29-
unzip \
30-
diffutils \
31-
libstdc++-devel \
8+
RUN yum -y install \
9+
binutils \
10+
gcc \
11+
git \
12+
unzip \
13+
libcurl-devel \
14+
libedit-devel \
15+
libicu-devel \
16+
sqlite-devel \
17+
libuuid-devel \
18+
libxml2-devel \
19+
python3-devel \
20+
libstdc++-devel \
3221
libstdc++-static
3322

3423

@@ -49,9 +38,6 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
4938
SWIFT_WEBROOT=$SWIFT_WEBROOT \
5039
SWIFT_PREFIX=$SWIFT_PREFIX
5140

52-
COPY swift-ci/dependencies/requirements.txt /dependencies/
53-
RUN pip3 install -r /dependencies/requirements.txt
54-
5541
RUN set -e; \
5642
ARCH_NAME="$(rpm --eval '%{_arch}')"; \
5743
url=; \

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

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,19 @@ LABEL description="Docker Container for the Swift programming language"
55
RUN groupadd -g 998 build-user && \
66
useradd -m -r -u 998 -g build-user build-user
77

8-
RUN yum install -y \
9-
libcurl-devel \
10-
libedit-devel \
11-
libicu-devel \
12-
sqlite-devel \
13-
libuuid-devel \
14-
libxml2-devel \
15-
python3 \
16-
python3-pip \
17-
python3-devel \
18-
python3-distro \
19-
python3-setuptools \
20-
python3-six \
21-
rsync \
22-
swig \
23-
clang \
24-
perl-podlators \
25-
which \
26-
git \
27-
cmake \
28-
zip \
29-
unzip \
30-
diffutils \
31-
libstdc++-devel \
8+
RUN yum -y install \
9+
binutils \
10+
gcc \
11+
git \
12+
unzip \
13+
libcurl-devel \
14+
libedit-devel \
15+
libicu-devel \
16+
sqlite-devel \
17+
libuuid-devel \
18+
libxml2-devel \
19+
python3-devel \
20+
libstdc++-devel \
3221
libstdc++-static
3322

3423

‎nightly-6.1/ubuntu/24.04/Dockerfile‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ LABEL description="Docker Container for the Swift programming language"
55
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
66
apt-get -q install -y \
77
binutils \
8+
curl \
89
git \
9-
unzip \
1010
gnupg2 \
1111
libc6-dev \
1212
libcurl4-openssl-dev \
13+
libncurses5-dev \
1314
libedit2 \
1415
libgcc-13-dev \
1516
libpython3-dev \
1617
libsqlite3-0 \
1718
libstdc++-13-dev \
1819
libxml2-dev \
19-
libncurses-dev \
2020
libz3-dev \
2121
pkg-config \
2222
tzdata \
@@ -45,11 +45,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
4545
RUN echo "${SWIFT_WEBROOT}/latest-build.yml"
4646

4747
RUN set -e; \
48-
# - Grab curl here so we cache better up above
49-
export DEBIAN_FRONTEND=noninteractive \
50-
&& apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
51-
# - Latest Toolchain info
52-
&& export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \
48+
export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \
5349
&& export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g') \
5450
&& export DOWNLOAD_DIR=$(echo $download | sed "s/-${OS_VER}.tar.gz//g") \
5551
&& echo $DOWNLOAD_DIR > .swift_tag \

‎nightly-6.1/ubuntu/24.04/buildx/Dockerfile‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ LABEL description="Docker Container for the Swift programming language"
55
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
66
apt-get -q install -y \
77
binutils \
8+
curl \
89
git \
910
gnupg2 \
1011
libc6-dev \
1112
libcurl4-openssl-dev \
1213
libncurses5-dev \
1314
libedit2 \
14-
libgcc-11-dev \
15+
libgcc-13-dev \
1516
libpython3-dev \
1617
libsqlite3-0 \
17-
libstdc++-11-dev \
18+
libstdc++-13-dev \
1819
libxml2-dev \
1920
libz3-dev \
2021
pkg-config \
2122
tzdata \
22-
zip \
2323
zlib1g-dev \
2424
&& rm -r /var/lib/apt/lists/*
2525

@@ -51,11 +51,7 @@ ARG PLATFORM_WEBROOT="$SWIFT_WEBROOT/$SWIFT_PLATFORM$OS_MAJOR_VER$OS_MIN_VER$OS_
5151
RUN echo "${PLATFORM_WEBROOT}/latest-build.yml"
5252

5353
RUN set -e; \
54-
# - Grab curl here so we cache better up above
55-
export DEBIAN_FRONTEND=noninteractive \
56-
&& apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
57-
# - Latest Toolchain info
58-
&& export $(curl -s ${PLATFORM_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \
54+
export $(curl -s ${PLATFORM_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \
5955
&& export $(curl -s ${PLATFORM_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g') \
6056
&& export DOWNLOAD_DIR=$(echo $download | sed "s/-${OS_VER}.tar.gz//g") \
6157
&& echo $DOWNLOAD_DIR > .swift_tag \

‎nightly-main/debian/12/Dockerfile‎

Lines changed: 20 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,25 @@ FROM debian:12
33
RUN groupadd -g 998 build-user && \
44
useradd -m -r -u 998 -g build-user build-user
55

6-
ENV DEBIAN_FRONTEND="noninteractive"
7-
8-
RUN apt-get -y update && apt-get -y install \
9-
build-essential \
10-
clang \
11-
cmake \
12-
diffutils \
13-
git \
14-
icu-devtools \
15-
libcurl4-openssl-dev \
16-
libedit-dev \
17-
libicu-dev \
18-
libncurses-dev \
19-
libpython3-dev \
20-
libsqlite3-dev \
21-
libxml2-dev \
22-
ninja-build \
23-
pkg-config \
24-
python3-distutils \
25-
python3-pip \
26-
python3-pkg-resources \
27-
python3-psutil \
28-
rsync \
29-
swig \
30-
systemtap-sdt-dev \
31-
tzdata \
32-
uuid-dev \
33-
zip \
34-
libstdc++-12-dev
6+
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
7+
apt-get -q install -y \
8+
binutils-gold \
9+
curl \
10+
gpg \
11+
libicu-dev \
12+
libcurl4-openssl-dev \
13+
libedit-dev \
14+
libsqlite3-dev \
15+
libncurses-dev \
16+
libpython3-dev \
17+
libxml2-dev \
18+
pkg-config \
19+
uuid-dev \
20+
tzdata \
21+
git \
22+
gcc \
23+
libstdc++-12-dev \
24+
&& rm -r /var/lib/apt/lists/*
3525

3626

3727
ARG SWIFT_SIGNING_KEY=E813C892820A6FA13755B268F167DF1ACF9CE069
@@ -61,10 +51,7 @@ RUN set -e; \
6151
;; \
6252
*) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \
6353
esac; \
64-
# - Grab curl here so we cache better up above
65-
export DEBIAN_FRONTEND=noninteractive \
66-
&& apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
67-
&& export $(curl -s ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \
54+
export $(curl -s ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \
6855
&& export $(curl -s ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g') \
6956
&& export DOWNLOAD_DIR=$(echo $download | sed "s/-${SWIFT_PLATFORM}${OS_ARCH_SUFFIX}.tar.gz//g") \
7057
&& echo $DOWNLOAD_DIR > .swift_tag \

0 commit comments

Comments
 (0)