Skip to content

Update installed packages after nightly platform expansion #458

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Apr 2, 2025
Merged

Update installed packages after nightly platform expansion #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce4484a
update nightly-6.1 dependencies
justice-adams-apple Apr 1, 2025
8aff728
update nightly-main dependencies
justice-adams-apple Apr 1, 2025
0aab5e1
fix ubuntu images
justice-adams-apple Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 20 additions & 36 deletions nightly-6.1/debian/12/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,25 @@ FROM debian:12
RUN groupadd -g 998 build-user && \
useradd -m -r -u 998 -g build-user build-user

ENV DEBIAN_FRONTEND="noninteractive"

RUN apt-get -y update && apt-get -y install \
build-essential \
clang \
cmake \
diffutils \
git \
icu-devtools \
libcurl4-openssl-dev \
libedit-dev \
libicu-dev \
libncurses-dev \
libpython3-dev \
libsqlite3-dev \
libxml2-dev \
ninja-build \
pkg-config \
python3-distutils \
python3-pip \
python3-pkg-resources \
python3-psutil \
rsync \
swig \
systemtap-sdt-dev \
tzdata \
uuid-dev \
zip \
libstdc++-12-dev
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
apt-get -q install -y \
binutils-gold \
curl \
gpg \
libicu-dev \
libcurl4-openssl-dev \
libedit-dev \
libsqlite3-dev \
libncurses-dev \
libpython3-dev \
libxml2-dev \
pkg-config \
uuid-dev \
tzdata \
git \
gcc \
libstdc++-12-dev \
&& rm -r /var/lib/apt/lists/*


ARG SWIFT_SIGNING_KEY=E813C892820A6FA13755B268F167DF1ACF9CE069
Expand All @@ -46,9 +36,6 @@ ENV SWIFT_PLATFORM=$SWIFT_PLATFORM \
SWIFT_WEBROOT=$SWIFT_WEBROOT \
SWIFT_PREFIX=$SWIFT_PREFIX

COPY swift-ci/dependencies/requirements.txt /dependencies/
RUN pip3 install -r /dependencies/requirements.txt --break-system-packages

RUN set -e; \
ARCH_NAME="$(dpkg --print-architecture)"; \
url=; \
Expand All @@ -61,10 +48,7 @@ RUN set -e; \
;; \
*) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \
esac; \
# - Grab curl here so we cache better up above
export DEBIAN_FRONTEND=noninteractive \
&& apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
&& export $(curl -s ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \
export $(curl -s ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \
&& export $(curl -s ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g') \
&& export DOWNLOAD_DIR=$(echo $download | sed "s/-${SWIFT_PLATFORM}${OS_ARCH_SUFFIX}.tar.gz//g") \
&& echo $DOWNLOAD_DIR > .swift_tag \
Expand Down
53 changes: 20 additions & 33 deletions nightly-6.1/debian/12/buildx/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,25 @@ FROM debian:12 as Base
RUN groupadd -g 998 build-user && \
useradd -m -r -u 998 -g build-user build-user

ENV DEBIAN_FRONTEND="noninteractive"

RUN apt-get -y update && apt-get -y install \
build-essential \
clang \
cmake \
diffutils \
git \
icu-devtools \
libcurl4-openssl-dev \
libedit-dev \
libicu-dev \
libncurses-dev \
libpython3-dev \
libsqlite3-dev \
libxml2-dev \
ninja-build \
pkg-config \
python3-distutils \
python3-pip \
python3-pkg-resources \
python3-psutil \
rsync \
swig \
systemtap-sdt-dev \
tzdata \
uuid-dev \
zip \
libstdc++-12-dev
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
apt-get -q install -y \
binutils-gold \
curl \
gpg \
libicu-dev \
libcurl4-openssl-dev \
libedit-dev \
libsqlite3-dev \
libncurses-dev \
libpython3-dev \
libxml2-dev \
pkg-config \
uuid-dev \
tzdata \
git \
gcc \
libstdc++-12-dev \
&& rm -r /var/lib/apt/lists/*


ARG SWIFT_SIGNING_KEY=E813C892820A6FA13755B268F167DF1ACF9CE069
Expand Down Expand Up @@ -68,10 +58,7 @@ RUN set -e; \
;; \
*) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \
esac; \
# - Grab curl here so we cache better up above
export DEBIAN_FRONTEND=noninteractive \
&& apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
&& export $(curl -s ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \
export $(curl -s ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \
&& export $(curl -s ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g') \
&& export DOWNLOAD_DIR=$(echo $download | sed "s/-${SWIFT_PLATFORM}${OS_ARCH_SUFFIX}.tar.gz//g") \
&& echo $DOWNLOAD_DIR > .swift_tag \
Expand Down
40 changes: 13 additions & 27 deletions nightly-6.1/fedora/39/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,19 @@ LABEL description="Docker Container for the Swift programming language"
RUN groupadd -g 998 build-user && \
useradd -m -r -u 998 -g build-user build-user

RUN yum install -y \
libcurl-devel \
libedit-devel \
libicu-devel \
sqlite-devel \
libuuid-devel \
libxml2-devel \
python3 \
python3-pip \
python3-devel \
python3-distro \
python3-setuptools \
python3-six \
rsync \
swig \
clang \
perl-podlators \
which \
git \
cmake \
zip \
unzip \
diffutils \
libstdc++-devel \
RUN yum -y install \
binutils \
gcc \
git \
unzip \
libcurl-devel \
libedit-devel \
libicu-devel \
sqlite-devel \
libuuid-devel \
libxml2-devel \
python3-devel \
libstdc++-devel \
libstdc++-static


Expand All @@ -49,9 +38,6 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
SWIFT_WEBROOT=$SWIFT_WEBROOT \
SWIFT_PREFIX=$SWIFT_PREFIX

COPY swift-ci/dependencies/requirements.txt /dependencies/
RUN pip3 install -r /dependencies/requirements.txt

RUN set -e; \
ARCH_NAME="$(rpm --eval '%{_arch}')"; \
url=; \
Expand Down
37 changes: 13 additions & 24 deletions nightly-6.1/fedora/39/buildx/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,19 @@ LABEL description="Docker Container for the Swift programming language"
RUN groupadd -g 998 build-user && \
useradd -m -r -u 998 -g build-user build-user

RUN yum install -y \
libcurl-devel \
libedit-devel \
libicu-devel \
sqlite-devel \
libuuid-devel \
libxml2-devel \
python3 \
python3-pip \
python3-devel \
python3-distro \
python3-setuptools \
python3-six \
rsync \
swig \
clang \
perl-podlators \
which \
git \
cmake \
zip \
unzip \
diffutils \
libstdc++-devel \
RUN yum -y install \
binutils \
gcc \
git \
unzip \
libcurl-devel \
libedit-devel \
libicu-devel \
sqlite-devel \
libuuid-devel \
libxml2-devel \
python3-devel \
libstdc++-devel \
libstdc++-static


Expand Down
10 changes: 3 additions & 7 deletions nightly-6.1/ubuntu/24.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ 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 \
binutils \
curl \
git \
unzip \
gnupg2 \
libc6-dev \
libcurl4-openssl-dev \
libncurses5-dev \
libedit2 \
libgcc-13-dev \
libpython3-dev \
libsqlite3-0 \
libstdc++-13-dev \
libxml2-dev \
libncurses-dev \
libz3-dev \
pkg-config \
tzdata \
Expand Down Expand Up @@ -45,11 +45,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
RUN echo "${SWIFT_WEBROOT}/latest-build.yml"

RUN set -e; \
# - Grab curl here so we cache better up above
export DEBIAN_FRONTEND=noninteractive \
&& apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
# - Latest Toolchain info
&& export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \
export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \
&& export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g') \
&& export DOWNLOAD_DIR=$(echo $download | sed "s/-${OS_VER}.tar.gz//g") \
&& echo $DOWNLOAD_DIR > .swift_tag \
Expand Down
12 changes: 4 additions & 8 deletions nightly-6.1/ubuntu/24.04/buildx/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ 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 \
binutils \
curl \
git \
gnupg2 \
libc6-dev \
libcurl4-openssl-dev \
libncurses5-dev \
libedit2 \
libgcc-11-dev \
libgcc-13-dev \
libpython3-dev \
libsqlite3-0 \
libstdc++-11-dev \
libstdc++-13-dev \
libxml2-dev \
libz3-dev \
pkg-config \
tzdata \
zip \
zlib1g-dev \
&& rm -r /var/lib/apt/lists/*

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

RUN set -e; \
# - Grab curl here so we cache better up above
export DEBIAN_FRONTEND=noninteractive \
&& apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
# - Latest Toolchain info
&& export $(curl -s ${PLATFORM_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \
export $(curl -s ${PLATFORM_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \
&& export $(curl -s ${PLATFORM_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g') \
&& export DOWNLOAD_DIR=$(echo $download | sed "s/-${OS_VER}.tar.gz//g") \
&& echo $DOWNLOAD_DIR > .swift_tag \
Expand Down
53 changes: 20 additions & 33 deletions nightly-main/debian/12/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,25 @@ FROM debian:12
RUN groupadd -g 998 build-user && \
useradd -m -r -u 998 -g build-user build-user

ENV DEBIAN_FRONTEND="noninteractive"

RUN apt-get -y update && apt-get -y install \
build-essential \
clang \
cmake \
diffutils \
git \
icu-devtools \
libcurl4-openssl-dev \
libedit-dev \
libicu-dev \
libncurses-dev \
libpython3-dev \
libsqlite3-dev \
libxml2-dev \
ninja-build \
pkg-config \
python3-distutils \
python3-pip \
python3-pkg-resources \
python3-psutil \
rsync \
swig \
systemtap-sdt-dev \
tzdata \
uuid-dev \
zip \
libstdc++-12-dev
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
apt-get -q install -y \
binutils-gold \
curl \
gpg \
libicu-dev \
libcurl4-openssl-dev \
libedit-dev \
libsqlite3-dev \
libncurses-dev \
libpython3-dev \
libxml2-dev \
pkg-config \
uuid-dev \
tzdata \
git \
gcc \
libstdc++-12-dev \
&& rm -r /var/lib/apt/lists/*


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