Skip to content

Update Swift versions #14342

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

Open
FranzBusch wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update Swift versions #14342

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee5b536
Update Swift versions
FranzBusch Nov 27, 2025
821d534
Merge branch 'master' into fb-swift-versions
DavidKorczynski Mar 14, 2026
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
23 changes: 12 additions & 11 deletions infra/base-images/base-builder/install_swift_ubuntu-24-04.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,29 +19,30 @@
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 \
uuid-dev \
zlib1g-dev"
SWIFT_URL="https://download.swift.org/swift-6.1.3-release/ubuntu2004/swift-6.1.3-RELEASE/swift-6.1.3-RELEASE-ubuntu20.04.tar.gz"
SWIFT_DIR="swift-6.1.3-RELEASE-ubuntu20_04"
elif [[ "$VERSION_ID" == "24.04" ]]; then
SWIFT_PACKAGES="wget \
binutils \
SWIFT_PACKAGES="binutils \
git \
unzip \
gnupg2 \
libc6-dev \
libcurl4-openssl-dev \
Expand All @@ -58,8 +59,8 @@ elif [[ "$VERSION_ID" == "24.04" ]]; then
zip \
unzip \
zlib1g-dev"
SWIFT_URL="https://download.swift.org/swift-6.1.3-release/ubuntu2404/swift-6.1.3-RELEASE/swift-6.1.3-RELEASE-ubuntu24.04.tar.gz"
SWIFT_DIR="swift-6.1.3-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
Expand Down
2 changes: 1 addition & 1 deletion projects/grpc-swift/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions projects/grpc-swift/project.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ sanitizers:
- address
- thread
main_repo: 'https://github.com/grpc/grpc-swift'
base_os_version: ubuntu-24-04
2 changes: 1 addition & 1 deletion projects/swift-nio/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions projects/swift-nio/project.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ sanitizers:
- address
- thread
main_repo: 'https://github.com/apple/swift-nio.git'
base_os_version: ubuntu-24-04
2 changes: 1 addition & 1 deletion projects/swift-protobuf/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions projects/swift-protobuf/project.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading