Swift 6.2

build/000-install-dependencies-nobel.sh

@@ -48,5 +48,10 @@ apt-get install -y  \
     vim                         \
     rpl
 
+# Swiftly dependency
+apt-get install -y \
+  gnupg2 \
+  jq
+
 clang --version
 

build/020-clone-swift.sh

@@ -2,7 +2,7 @@
 set -ex
 
 ROOT_DIR=$(realpath $(dirname $0))/../
-SWIFT_VERSION="6.1"
+SWIFT_VERSION="6.2"
 BRANCH="release/$SWIFT_VERSION"
 
 source $HOME/.build_env
@@ -42,13 +42,25 @@ popd
 
 # Install swift for bootstraping
 pushd $HOME
-    wget https://download.swift.org/swift-$SWIFT_VERSION-release/ubuntu2404/swift-$SWIFT_VERSION-RELEASE/swift-$SWIFT_VERSION-RELEASE-ubuntu24.04.tar.gz
-    tar -xvzf swift-$SWIFT_VERSION-RELEASE-ubuntu24.04.tar.gz
-    rm swift-$SWIFT_VERSION-RELEASE-ubuntu24.04.tar.gz
-    mv $HOME/swift-$SWIFT_VERSION-RELEASE-ubuntu24.04 $HOME/swift-toolchain
-    export PATH=$HOME/swift-toolchain/usr/bin:$PATH
-    echo "export PATH=\$HOME/swift-toolchain/usr/bin:\$PATH" >> .build_env
-    echo "export SWIFT_PATH=\$HOME/swift-toolchain/usr/bin" >> .build_env
-
-    swift --version
+    curl -O https://download.swift.org/swiftly/linux/swiftly-$(uname -m).tar.gz
+    tar zxf swiftly-$(uname -m).tar.gz
+
+    export SWIFTLY_HOME_DIR="$HOME/.local/share/swiftly"
+    export SWIFTLY_BIN_DIR="$HOME/.local/bin"
+    export SWIFTLY_TOOLCHAINS_DIR="$HOME/.local/share/swiftly/toolchains"
+
+    ./swiftly init --quiet-shell-followup
+    source "$SWIFTLY_HOME_DIR/env.sh"
+    hash -r
+
+    swiftly install 6.2-snapshot
+    swiftly use 6.2-snapshot
+
+    pushd .local/share/swiftly/toolchains/6.2-snapshot-2025-07-04/usr/bin/
+        ./clang --version
+    popd
+
+    # Export SWIFT_PATH
+    TOOLCHAIN_NAME=$(jq -r '.inUse' "$SWIFTLY_HOME_DIR/config.json")
+    echo "export SWIFT_PATH=\"$SWIFTLY_HOME_DIR/toolchains/$TOOLCHAIN_NAME/usr/bin\"" >> .build_env
 popd

build/version

@@ -1 +1 @@
-6.1-r1
+6.2-r1