From 7064cbab403d3c5fc5b70a79657ef3cebea6994b Mon Sep 17 00:00:00 2001
From: Danny Canter <danny_canter@apple.com>
Date: Wed, 4 Mar 2026 19:11:46 -0800
Subject: [PATCH] vminitd: Bump Swift version to 6.3-snapshot (#570)

Closes #221

This contains (in the static linux sdk but the swift version and the sdk
must match) libarchive support and mimalloc! This also (unrelated to the
sdk bump it seems) raises the amount of retries we do when dialing
vminitd. It seems CI on rare occasions recently has timed out on some
tests. We could also explore just lowering the concurrency on the
integration suite.
---
 .swift-version                                          | 2 +-
 Sources/Containerization/VZVirtualMachine+Helpers.swift | 4 ++--
 vminitd/Makefile                                        | 4 ++--
 vminitd/Package.swift                                   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.swift-version b/.swift-version
index 913671cd..23ee9ab8 100644
--- a/.swift-version
+++ b/.swift-version
@@ -1 +1 @@
-6.2
\ No newline at end of file
+6.3-snapshot-2026-02-27
\ No newline at end of file
diff --git a/Sources/Containerization/VZVirtualMachine+Helpers.swift b/Sources/Containerization/VZVirtualMachine+Helpers.swift
index 1c3ae3da..2cbadb1c 100644
--- a/Sources/Containerization/VZVirtualMachine+Helpers.swift
+++ b/Sources/Containerization/VZVirtualMachine+Helpers.swift
@@ -123,7 +123,7 @@ extension VZVirtualMachine {
 
 extension VZVirtualMachine {
     func waitForAgent(queue: DispatchQueue) async throws -> FileHandle {
-        let agentConnectionRetryCount: Int = 150
+        let agentConnectionRetryCount: Int = 200
         let agentConnectionSleepDuration: Duration = .milliseconds(20)
 
         for _ in 0...agentConnectionRetryCount {
@@ -134,7 +134,7 @@ extension VZVirtualMachine {
                 continue
             }
         }
-        throw ContainerizationError(.invalidArgument, message: "no connection to agent socket")
+        throw ContainerizationError(.timeout, message: "failed to get a connection to agent socket")
     }
 }
 
diff --git a/vminitd/Makefile b/vminitd/Makefile
index 7b3c9947..14b27c53 100644
--- a/vminitd/Makefile
+++ b/vminitd/Makefile
@@ -17,8 +17,8 @@ WARNINGS_AS_ERRORS ?= true
 SWIFT_WARNING_CONFIG := $(if $(filter-out false,$(WARNINGS_AS_ERRORS)),-Xswiftc -warnings-as-errors)
 SWIFT_CONFIGURATION := --swift-sdk aarch64-swift-linux-musl $(SWIFT_WARNING_CONFIG) -Xlinker -s --disable-automatic-resolution
 
-SWIFT_VERSION := 6.2.3
-SWIFT_SDK_URL := https://download.swift.org/swift-6.2.3-release/static-sdk/swift-6.2.3-RELEASE/swift-6.2.3-RELEASE_static-linux-0.0.1.artifactbundle.tar.gz
+SWIFT_VERSION := 6.3-snapshot-2026-02-27
+SWIFT_SDK_URL := https://download.swift.org/swift-6.3-branch/static-sdk/swift-6.3-DEVELOPMENT-SNAPSHOT-2026-02-27-a/swift-6.3-DEVELOPMENT-SNAPSHOT-2026-02-27-a_static-linux-0.1.0.artifactbundle.tar.gz
 SWIFT_SDK_PATH := /tmp/$(notdir $(SWIFT_SDK_URL))
 
 SWIFTLY_URL := https://download.swift.org/swiftly/darwin/swiftly.pkg
diff --git a/vminitd/Package.swift b/vminitd/Package.swift
index 5943ffbd..8722193e 100644
--- a/vminitd/Package.swift
+++ b/vminitd/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 6.2
+// swift-tools-version: 6.3
 //===----------------------------------------------------------------------===//
 // Copyright © 2025-2026 Apple Inc. and the Containerization project authors.
 //