From d4e8d01a76c9c549362771bfe6ed15d04b9142d0 Mon Sep 17 00:00:00 2001 From: Franz Busch Date: Thu, 27 Nov 2025 09:25:08 +0100 Subject: [PATCH 1/3] 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. --- infra/base-images/base-builder/install_swift_ubuntu_24_04.sh | 4 ++-- projects/grpc-swift/Dockerfile | 2 +- projects/swift-nio/Dockerfile | 2 +- projects/swift-protobuf/Dockerfile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/infra/base-images/base-builder/install_swift_ubuntu_24_04.sh b/infra/base-images/base-builder/install_swift_ubuntu_24_04.sh index bd325a2aeda2..79804571c20e 100755 --- a/infra/base-images/base-builder/install_swift_ubuntu_24_04.sh +++ b/infra/base-images/base-builder/install_swift_ubuntu_24_04.sh @@ -53,8 +53,8 @@ elif [[ "$VERSION_ID" == "24.04" ]]; then 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.1-release/ubuntu2404/swift-6.2.1-RELEASE/swift-6.2.1-RELEASE-ubuntu24.04.tar.gz" + SWIFT_DIR="swift-6.2.1-RELEASE-ubuntu24.04" else echo "Unsupported Ubuntu version: $VERSION_ID" exit 1 diff --git a/projects/grpc-swift/Dockerfile b/projects/grpc-swift/Dockerfile index 981ebe9d2ae2..55c4274a2517 100644 --- a/projects/grpc-swift/Dockerfile +++ b/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 diff --git a/projects/swift-nio/Dockerfile b/projects/swift-nio/Dockerfile index 1e47174c06b5..ab6db20b173e 100644 --- a/projects/swift-nio/Dockerfile +++ b/projects/swift-nio/Dockerfile @@ -14,7 +14,7 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder-swift +FROM grc.io/oss-fuzz-base/base-builder-swift:ubuntu-24-04 # specific swift-nio RUN git clone --depth 1 https://github.com/google/fuzzing diff --git a/projects/swift-protobuf/Dockerfile b/projects/swift-protobuf/Dockerfile index d8be91344ce2..a89941b6ad34 100644 --- a/projects/swift-protobuf/Dockerfile +++ b/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 https://github.com/apple/swift-protobuf.git COPY build.sh $SRC From 8c8f2ccb0d5f71fb5c2fb62de47b9e472c5bb2de Mon Sep 17 00:00:00 2001 From: Franz Busch Date: Thu, 27 Nov 2025 13:34:57 +0100 Subject: [PATCH 2/3] Update projects/swift-nio/Dockerfile Co-authored-by: Kleis Auke Wolthuizen --- projects/swift-nio/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/swift-nio/Dockerfile b/projects/swift-nio/Dockerfile index ab6db20b173e..66e59a249a0c 100644 --- a/projects/swift-nio/Dockerfile +++ b/projects/swift-nio/Dockerfile @@ -14,7 +14,7 @@ # ################################################################################ -FROM grc.io/oss-fuzz-base/base-builder-swift:ubuntu-24-04 +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 From 4f968e16ea2bd57caec48fb58a98571f385a9c79 Mon Sep 17 00:00:00 2001 From: Franz Busch Date: Fri, 12 Dec 2025 10:29:36 +0100 Subject: [PATCH 3/3] Update base os version --- projects/grpc-swift/project.yaml | 1 + projects/swift-nio/project.yaml | 1 + projects/swift-protobuf/project.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/projects/grpc-swift/project.yaml b/projects/grpc-swift/project.yaml index 2b5c23049487..2e54fad15d7b 100644 --- a/projects/grpc-swift/project.yaml +++ b/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 diff --git a/projects/swift-nio/project.yaml b/projects/swift-nio/project.yaml index 6c9a01ddc550..1274bb07e8cd 100644 --- a/projects/swift-nio/project.yaml +++ b/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 diff --git a/projects/swift-protobuf/project.yaml b/projects/swift-protobuf/project.yaml index 59149b6bb906..37f39640e186 100644 --- a/projects/swift-protobuf/project.yaml +++ b/projects/swift-protobuf/project.yaml @@ -13,3 +13,4 @@ sanitizers: - thread coverage_extra_args: -ignore-filename-regex=.*.pb.swift main_repo: 'https://github.com/apple/swift-protobuf.git' +base_os_version: ubuntu-24-04