From a087470b0178cdfd951d99c3691a3b685729699a Mon Sep 17 00:00:00 2001
From: Paul LeMarquand <plemarquand@apple.com>
Date: Thu, 30 Oct 2025 10:52:15 -0400
Subject: [PATCH] Add zip as a dependency on Linux distributions

On Linux, Swift Testing uses the zip package/tool to compress
directories when they are recorded as test attachments.

Adds to the nightly 6.2, nightly main and swift-ci main docker
containers since this swift testing feature was introduced in 6.2.

This should be merged at the same time as swiftlang/swiftly#451
---
 nightly-6.2/fedora/39/Dockerfile            | 1 +
 nightly-6.2/fedora/39/buildx/Dockerfile     | 1 +
 nightly-6.2/ubuntu/20.04/buildx/Dockerfile  | 1 +
 nightly-main/fedora/39/Dockerfile           | 1 +
 nightly-main/fedora/39/buildx/Dockerfile    | 1 +
 nightly-main/ubuntu/20.04/buildx/Dockerfile | 1 +
 6 files changed, 6 insertions(+)

diff --git a/nightly-6.2/fedora/39/Dockerfile b/nightly-6.2/fedora/39/Dockerfile
index e94c3689..08b2d408 100644
--- a/nightly-6.2/fedora/39/Dockerfile
+++ b/nightly-6.2/fedora/39/Dockerfile
@@ -6,6 +6,7 @@ RUN yum -y install \
   binutils \
   gcc \
   git \
+  zip \
   unzip \
   libcurl-devel \
   libedit-devel \
diff --git a/nightly-6.2/fedora/39/buildx/Dockerfile b/nightly-6.2/fedora/39/buildx/Dockerfile
index 59ed0737..805da82a 100644
--- a/nightly-6.2/fedora/39/buildx/Dockerfile
+++ b/nightly-6.2/fedora/39/buildx/Dockerfile
@@ -6,6 +6,7 @@ RUN yum -y install \
   binutils \
   gcc \
   git \
+  zip \
   unzip \
   libcurl-devel \
   libedit-devel \
diff --git a/nightly-6.2/ubuntu/20.04/buildx/Dockerfile b/nightly-6.2/ubuntu/20.04/buildx/Dockerfile
index 44db2825..6ad4dd5b 100644
--- a/nightly-6.2/ubuntu/20.04/buildx/Dockerfile
+++ b/nightly-6.2/ubuntu/20.04/buildx/Dockerfile
@@ -6,6 +6,7 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
     apt-get -q install -y \
     binutils \
     git \
+    zip \
     unzip \
     gnupg2 \
     libc6-dev \
diff --git a/nightly-main/fedora/39/Dockerfile b/nightly-main/fedora/39/Dockerfile
index 678fbbb5..68bb73de 100644
--- a/nightly-main/fedora/39/Dockerfile
+++ b/nightly-main/fedora/39/Dockerfile
@@ -6,6 +6,7 @@ RUN yum -y install \
   binutils \
   gcc \
   git \
+  zip \
   unzip \
   libcurl-devel \
   libedit-devel \
diff --git a/nightly-main/fedora/39/buildx/Dockerfile b/nightly-main/fedora/39/buildx/Dockerfile
index 5cefaba3..e7d8208b 100644
--- a/nightly-main/fedora/39/buildx/Dockerfile
+++ b/nightly-main/fedora/39/buildx/Dockerfile
@@ -6,6 +6,7 @@ RUN yum -y install \
   binutils \
   gcc \
   git \
+  zip \
   unzip \
   libcurl-devel \
   libedit-devel \
diff --git a/nightly-main/ubuntu/20.04/buildx/Dockerfile b/nightly-main/ubuntu/20.04/buildx/Dockerfile
index 3f812801..53dada94 100644
--- a/nightly-main/ubuntu/20.04/buildx/Dockerfile
+++ b/nightly-main/ubuntu/20.04/buildx/Dockerfile
@@ -6,6 +6,7 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
     apt-get -q install -y \
     binutils \
     git \
+    zip \
     unzip \
     gnupg2 \
     libc6-dev \