Update Swift versions

Updates the Swift version to the latest released Swift version. This ensures that the projects are fuzzed against the latest compiler and runtime versions. Additionally, some projects don't support 5.10 anymore so bumping to 6.2 should give us the latest versions of those projects.

Update projects/swift-nio/Dockerfile

Co-authored-by: Kleis Auke Wolthuizen <github@kleisauke.nl>

Update base os version

Update swift deps

Author: FranzBusch

infra/base-images/base-builder/install_swift_ubuntu_24_04.sh

@@ -19,42 +19,45 @@
 source /etc/os-release
 
 if [[ "$VERSION_ID" == "20.04" ]]; then
-  SWIFT_PACKAGES="wget \
-            binutils \
+  SWIFT_PACKAGES="binutils \
             git \
+            unzip \
             gnupg2 \
             libc6-dev \
-            libcurl4 \
+            libcurl4-openssl-dev \
             libedit2 \
-            libgcc-9-dev \
-            libpython2.7 \
+            libgcc-11-dev \
+            libpython3-dev \
             libsqlite3-0 \
-            libstdc++-9-dev \
-            libxml2 \
+            libstdc++-11-dev \
+            libxml2-dev \
             libz3-dev \
             pkg-config \
+            python3-lldb-13 \
             tzdata \
             zlib1g-dev"
   SWIFT_URL="https://download.swift.org/swift-5.10.1-release/ubuntu2004/swift-5.10.1-RELEASE/swift-5.10.1-RELEASE-ubuntu_20_04.tar.gz"
   SWIFT_DIR="swift-5.10.1-RELEASE-ubuntu_20_04"
 elif [[ "$VERSION_ID" == "24.04" ]]; then
-  SWIFT_PACKAGES="wget \
-            binutils \
+  SWIFT_PACKAGES="binutils \
             git \
+            unzip \
             gnupg2 \
             libc6-dev \
-            libcurl4 \
+            libcurl4-openssl-dev \
             libedit2 \
             libgcc-13-dev \
+            libpython3-dev \
             libsqlite3-0 \
             libstdc++-13-dev \
-            libxml2 \
+            libxml2-dev \
+            libncurses-dev \
             libz3-dev \
             pkg-config \
             tzdata \
             zlib1g-dev"
-  SWIFT_URL="https://download.swift.org/swift-5.10.1-release/ubuntu2404/swift-5.10.1-RELEASE/swift-5.10.1-RELEASE-ubuntu24.04.tar.gz"
-  SWIFT_DIR="swift-5.10.1-RELEASE-ubuntu24.04"
+  SWIFT_URL="https://download.swift.org/swift-6.2.3-release/ubuntu2404/swift-6.2.3-RELEASE/swift-6.2.3-RELEASE-ubuntu24.04.tar.gz"
+  SWIFT_DIR="swift-6.2.3-RELEASE-ubuntu24.04"
 else
   echo "Unsupported Ubuntu version: $VERSION_ID"
   exit 1

projects/grpc-swift/Dockerfile

@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-swift
+FROM gcr.io/oss-fuzz-base/base-builder-swift:ubuntu-24-04
 
 # specific to project
 RUN apt-get update && apt-get install -y zlib1g-dev

projects/grpc-swift/project.yaml

@@ -11,3 +11,4 @@ sanitizers:
 - address
 - thread
 main_repo: 'https://github.com/grpc/grpc-swift'
+base_os_version: ubuntu-24-04

projects/swift-nio/Dockerfile

@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-swift
+FROM gcr.io/oss-fuzz-base/base-builder-swift:ubuntu-24-04
 
 # specific swift-nio
 RUN git clone --depth 1 https://github.com/google/fuzzing

projects/swift-nio/project.yaml

@@ -12,3 +12,4 @@ sanitizers:
 - address
 - thread
 main_repo: 'https://github.com/apple/swift-nio.git'
+base_os_version: ubuntu-24-04

projects/swift-protobuf/Dockerfile

@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-swift
+FROM gcr.io/oss-fuzz-base/base-builder-swift:ubuntu-24-04
 
 RUN git clone --depth 1 --recurse-submodules --shallow-submodules https://github.com/apple/swift-protobuf.git
 COPY build.sh $SRC

projects/swift-protobuf/project.yaml

@@ -15,3 +15,4 @@ coverage_extra_args: >
   -ignore-filename-regex=.*\.pb\.swift
   -ignore-filename-regex=.*/\.build/.*
 main_repo: 'https://github.com/apple/swift-protobuf.git'
+base_os_version: ubuntu-24-04