Skip to content

Commit d4e8d01

Browse files
committed
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.
1 parent 9419be6 commit d4e8d01

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ elif [[ "$VERSION_ID" == "24.04" ]]; then
5353
pkg-config \
5454
tzdata \
5555
zlib1g-dev"
56-
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"
57-
SWIFT_DIR="swift-5.10.1-RELEASE-ubuntu24.04"
56+
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"
57+
SWIFT_DIR="swift-6.2.1-RELEASE-ubuntu24.04"
5858
else
5959
echo "Unsupported Ubuntu version: $VERSION_ID"
6060
exit 1

projects/grpc-swift/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#
1515
################################################################################
1616

17-
FROM gcr.io/oss-fuzz-base/base-builder-swift
17+
FROM gcr.io/oss-fuzz-base/base-builder-swift:ubuntu-24-04
1818

1919
# specific to project
2020
RUN apt-get update && apt-get install -y zlib1g-dev

projects/swift-nio/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#
1515
################################################################################
1616

17-
FROM gcr.io/oss-fuzz-base/base-builder-swift
17+
FROM grc.io/oss-fuzz-base/base-builder-swift:ubuntu-24-04
1818

1919
# specific swift-nio
2020
RUN git clone --depth 1 https://github.com/google/fuzzing

projects/swift-protobuf/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#
1515
################################################################################
1616

17-
FROM gcr.io/oss-fuzz-base/base-builder-swift
17+
FROM gcr.io/oss-fuzz-base/base-builder-swift:ubuntu-24-04
1818

1919
RUN git clone --depth 1 https://github.com/apple/swift-protobuf.git
2020
COPY build.sh $SRC

0 commit comments

Comments
 (0)