Update Swift to 6.1.3

thomasvl · thomasvl · commit 47f2d76be36d · 2025-12-15T15:00:11.000-05:00
6.2.3 would be current, but there doesn't seem to be a download for 2004, so this keeps everything else consistent. Update support packages based on: https://www.swift.org/install/linux/tarball/
diff --git a/infra/base-images/base-builder-swift/llvmsymbol.diff b/infra/base-images/base-builder-swift/llvmsymbol.diff
@@ -2,17 +2,14 @@ diff --git a/llvm/lib/DebugInfo/Symbolize/CMakeLists.txt b/llvm/lib/DebugInfo/Sy
 index acfb3bd0e..a499ee2e0 100644
 --- a/llvm/lib/DebugInfo/Symbolize/CMakeLists.txt
 +++ b/llvm/lib/DebugInfo/Symbolize/CMakeLists.txt
-@@ -12,4 +12,11 @@ add_llvm_component_library(LLVMSymbolize
+@@ -12,4 +12,8 @@ add_llvm_component_library(LLVMSymbolize
    Object
    Support
    Demangle
 -  )
 +
 +  LINK_LIBS
 +  /usr/lib/swift_static/linux/libswiftCore.a
-+  /usr/lib/swift_static/linux/libicui18nswift.a
-+  /usr/lib/swift_static/linux/libicuucswift.a
-+  /usr/lib/swift_static/linux/libicudataswift.a
 +  /usr/lib/x86_64-linux-gnu/libstdc++.so.6
 +)
 diff --git a/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp b/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp
diff --git a/infra/base-images/base-builder/install_swift.sh b/infra/base-images/base-builder/install_swift.sh
@@ -31,16 +31,17 @@ SWIFT_PACKAGES="wget \
           libz3-dev \
           pkg-config \
           tzdata \
+          uuid-dev \
           zlib1g-dev"
 SWIFT_SYMBOLIZER_PACKAGES="build-essential make cmake ninja-build git python3 g++-multilib binutils-dev zlib1g-dev"
 apt-get update && apt install -y $SWIFT_PACKAGES && \
   apt install -y $SWIFT_SYMBOLIZER_PACKAGES --no-install-recommends
 
 
-wget -q https://download.swift.org/swift-5.10.1-release/ubuntu2004/swift-5.10.1-RELEASE/swift-5.10.1-RELEASE-ubuntu20.04.tar.gz
-tar xzf swift-5.10.1-RELEASE-ubuntu20.04.tar.gz
-cp -r swift-5.10.1-RELEASE-ubuntu20.04/usr/* /usr/
-rm -rf swift-5.10.1-RELEASE-ubuntu20.04.tar.gz swift-5.10.1-RELEASE-ubuntu20.04/
+wget -q https://download.swift.org/swift-6.1.3-release/ubuntu2004/swift-6.1.3-RELEASE/swift-6.1.3-RELEASE-ubuntu20.04.tar.gz
+tar xzf swift-6.1.3-RELEASE-ubuntu20.04.tar.gz
+cp -r swift-6.1.3-RELEASE-ubuntu20.04/usr/* /usr/
+rm -rf swift-6.1.3-RELEASE-ubuntu20.04.tar.gz swift-6.1.3-RELEASE-ubuntu20.04/
 # TODO: Move to a seperate work dir
 git clone https://github.com/llvm/llvm-project.git
 cd llvm-project
@@ -63,5 +64,5 @@ cd $SRC
 rm -rf llvm-project llvmsymbol.diff
 
 # TODO: Cleanup packages
-apt-get remove --purge -y wget zlib1g-dev
+apt-get remove --purge -y wget
 apt-get autoremove -y
diff --git a/infra/base-images/base-builder/install_swift_ubuntu_20_04.sh b/infra/base-images/base-builder/install_swift_ubuntu_20_04.sh
@@ -31,16 +31,17 @@ SWIFT_PACKAGES="wget \
           libz3-dev \
           pkg-config \
           tzdata \
+          uuid-dev \
           zlib1g-dev"
 SWIFT_SYMBOLIZER_PACKAGES="build-essential make cmake ninja-build git python3 g++-multilib binutils-dev zlib1g-dev"
 apt-get update && apt install -y $SWIFT_PACKAGES && \
   apt install -y $SWIFT_SYMBOLIZER_PACKAGES --no-install-recommends
 
 
-wget -q https://download.swift.org/swift-5.10.1-release/ubuntu2004/swift-5.10.1-RELEASE/swift-5.10.1-RELEASE-ubuntu20.04.tar.gz
-tar xzf swift-5.10.1-RELEASE-ubuntu20.04.tar.gz
-cp -r swift-5.10.1-RELEASE-ubuntu20.04/usr/* /usr/
-rm -rf swift-5.10.1-RELEASE-ubuntu20.04.tar.gz swift-5.10.1-RELEASE-ubuntu20.04/
+wget -q https://download.swift.org/swift-6.1.3-release/ubuntu2004/swift-6.1.3-RELEASE/swift-6.1.3-RELEASE-ubuntu20.04.tar.gz
+tar xzf swift-6.1.3-RELEASE-ubuntu20.04.tar.gz
+cp -r swift-6.1.3-RELEASE-ubuntu20.04/usr/* /usr/
+rm -rf swift-6.1.3-RELEASE-ubuntu20.04.tar.gz swift-6.1.3-RELEASE-ubuntu20.04/
 # TODO: Move to a seperate work dir
 git clone https://github.com/llvm/llvm-project.git
 cd llvm-project
@@ -63,5 +64,5 @@ cd $SRC
 rm -rf llvm-project llvmsymbol.diff
 
 # TODO: Cleanup packages
-apt-get remove --purge -y wget zlib1g-dev
-apt-get autoremove -y
+apt-get remove --purge -y wget
+apt-get autoremove -y
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
@@ -34,27 +34,32 @@ if [[ "$VERSION_ID" == "20.04" ]]; then
             libz3-dev \
             pkg-config \
             tzdata \
+            uuid-dev \
             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"
+  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 \
             git \
             gnupg2 \
             libc6-dev \
-            libcurl4 \
+            libcurl4-openssl-dev \
             libedit2 \
             libgcc-13-dev \
+            libncurses-dev \
+            libpython3-dev \
             libsqlite3-0 \
             libstdc++-13-dev \
-            libxml2 \
+            libxml2-dev \
             libz3-dev \
             pkg-config \
             tzdata \
+            zip \
+            unzip \
             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.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"
 else
   echo "Unsupported Ubuntu version: $VERSION_ID"
   exit 1
@@ -92,5 +97,5 @@ cd $SRC
 rm -rf llvm-project llvmsymbol.diff
 
 # TODO: Cleanup packages
-apt-get remove --purge -y wget zlib1g-dev
+apt-get remove --purge -y wget
 apt-get autoremove -y
diff --git a/infra/base-images/base-builder/llvmsymbol.diff b/infra/base-images/base-builder/llvmsymbol.diff
@@ -2,17 +2,14 @@ diff --git a/llvm/lib/DebugInfo/Symbolize/CMakeLists.txt b/llvm/lib/DebugInfo/Sy
 index acfb3bd0e..a499ee2e0 100644
 --- a/llvm/lib/DebugInfo/Symbolize/CMakeLists.txt
 +++ b/llvm/lib/DebugInfo/Symbolize/CMakeLists.txt
-@@ -12,4 +12,11 @@ add_llvm_component_library(LLVMSymbolize
+@@ -12,4 +12,8 @@ add_llvm_component_library(LLVMSymbolize
    Object
    Support
    Demangle
 -  )
 +
 +  LINK_LIBS
 +  /usr/lib/swift_static/linux/libswiftCore.a
-+  /usr/lib/swift_static/linux/libicui18nswift.a
-+  /usr/lib/swift_static/linux/libicuucswift.a
-+  /usr/lib/swift_static/linux/libicudataswift.a
 +  /usr/lib/x86_64-linux-gnu/libstdc++.so.6
 +)
 diff --git a/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp b/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp
