lee/container
1
0 Fork 0
mirror of https://github.com/apple/container.git synced 2026-10-15 18:49:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

vminitd: Bump Swift version to 6.3-snapshot (#570)

Browse Source 
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.
This commit is contained in:
Danny Canter authored and GitHub committed 2026-03-04 19:11:46 -08:00
1 parent eff935e35f
commit 7064cbab40
4 files changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.swift-version
+1 -1
View File
@@ -1 +1 @@
6.2
6.3-snapshot-2026-02-27
Sources/Containerization/VZVirtualMachine+Helpers.swift
+2 -2
View File
@@ -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")
}
}
vminitd/Makefile
+2 -2
View File
@@ -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
vminitd/Package.swift
+1 -1
View File
@@ -1,4 +1,4 @@
// swift-tools-version: 6.2
// swift-tools-version: 6.3
//===----------------------------------------------------------------------===//
// Copyright © 2025-2026 Apple Inc. and the Containerization project authors.
//