From 9af8b8cca9e405c54c278157381b82f62c7eed04 Mon Sep 17 00:00:00 2001 From: Pedro Cuenca Date: Sun, 21 Jun 2026 18:55:13 +0200 Subject: [PATCH 1/3] Restore CI matrix --- .github/workflows/ci.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d407d56..35a7d06 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,16 +20,14 @@ jobs: fail-fast: false matrix: include: -# Temporarily remove Swift 6.1 because mlx-swift-lm 3 uses Swift 6 mode and there's -# a strict concurrency error on a non-sendable CIContext. -# - macos: "15" -# swift: "6.1" -# xcode: "16.3" -# traits: "" -# - macos: "15" -# swift: "6.1" -# xcode: "16.3" -# traits: "AsyncHTTPClient" + - macos: "15" + swift: "6.1" + xcode: "16.3" + traits: "" + - macos: "15" + swift: "6.1" + xcode: "16.3" + traits: "AsyncHTTPClient" - macos: "26" swift: "6.2" xcode: "26.0" From ca365100ab745e72e22051922aa70c6a38765bee Mon Sep 17 00:00:00 2001 From: Pedro Cuenca Date: Thu, 2 Jul 2026 17:06:07 +0200 Subject: [PATCH 2/3] Temporarily disable cache in CI --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35a7d06..321eee2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,6 +42,7 @@ jobs: uses: actions/checkout@v6 - name: Cache Swift Package Manager dependencies + if: false uses: actions/cache@v5 with: path: | @@ -85,6 +86,7 @@ jobs: uses: actions/checkout@v6 - name: Cache Swift Package Manager dependencies + if: false uses: actions/cache@v5 with: path: | From c0559bd03b95678c474ebd1d6ae3bfa63948551f Mon Sep 17 00:00:00 2001 From: Pedro Cuenca Date: Thu, 2 Jul 2026 17:33:17 +0200 Subject: [PATCH 3/3] Upgrade swift-syntax for mlx-swift-lm 3.31.4 to be resolved --- .github/workflows/ci.yml | 2 -- Package.resolved | 41 +++++++++++++++++++++++++++++++++------- Package.swift | 2 +- 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 321eee2..35a7d06 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,6 @@ jobs: uses: actions/checkout@v6 - name: Cache Swift Package Manager dependencies - if: false uses: actions/cache@v5 with: path: | @@ -86,7 +85,6 @@ jobs: uses: actions/checkout@v6 - name: Cache Swift Package Manager dependencies - if: false uses: actions/cache@v5 with: path: | diff --git a/Package.resolved b/Package.resolved index fc106f1..b689a69 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,13 +1,13 @@ { - "originHash" : "ac4d9985bc0c659d2c3e37b5e85c823ce19b8402e5b743a74d77a9199c3718e0", + "originHash" : "8c8059604845311c40f47c771a21887b94c4a9dffc50f0ffdeceef9ef2f3c866", "pins" : [ { "identity" : "eventsource", "kind" : "remoteSourceControl", "location" : "https://github.com/mattt/EventSource", "state" : { - "revision" : "bd64824505da71a1a403adb221f6e25413c0bc7f", - "version" : "1.4.0" + "revision" : "a3a85a85214caf642abaa96ae664e4c772a59f6e", + "version" : "1.4.1" } }, { @@ -28,13 +28,31 @@ "version" : "1.0.0" } }, + { + "identity" : "swift-atomics", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-atomics.git", + "state" : { + "revision" : "0442cb5a3f98ab802acb777929fdb446bda11a34", + "version" : "1.3.1" + } + }, { "identity" : "swift-collections", "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-collections.git", "state" : { - "revision" : "7b847a3b7008b2dc2f47ca3110d8c782fb2e5c7e", - "version" : "1.3.0" + "revision" : "a0cb0954ecb21e4e31b0070e6ed5674e8556685a", + "version" : "1.6.0" + } + }, + { + "identity" : "swift-nio", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-nio.git", + "state" : { + "revision" : "cd3e1152083706d77b223fb29110e590efcc70c0", + "version" : "2.101.2" } }, { @@ -42,8 +60,17 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/swiftlang/swift-syntax", "state" : { - "revision" : "0687f71944021d616d34d922343dcef086855920", - "version" : "600.0.1" + "revision" : "4799286537280063c85a32f09884cfbca301b1a1", + "version" : "602.0.0" + } + }, + { + "identity" : "swift-system", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-system.git", + "state" : { + "revision" : "7502b711c92a17741fa625d722b0ccbd595d8ed1", + "version" : "1.7.2" } } ], diff --git a/Package.swift b/Package.swift index d7e16c7..b559f0c 100644 --- a/Package.swift +++ b/Package.swift @@ -43,7 +43,7 @@ let package = Package( .package(url: "https://github.com/mattt/llama.swift", .upToNextMajor(from: "2.7484.0")), .package(url: "https://github.com/mattt/PartialJSONDecoder", from: "1.0.0"), .package(url: "https://github.com/ml-explore/mlx-swift-lm", from: "3.0.0"), - .package(url: "https://github.com/swiftlang/swift-syntax", from: "600.0.0"), + .package(url: "https://github.com/swiftlang/swift-syntax", from: "602.0.0"), .package(url: "https://github.com/swift-server/async-http-client.git", from: "1.24.0"), ], targets: [