fix SPM

ably · Aug 5, 2024 · d951f53 · d951f53
1 parent bb571cc
commit d951f53
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml
@@ -48,7 +48,7 @@ jobs:
     needs: generate-matrices
     strategy:
       fail-fast: false
-      matrix: ${{ fromJson(needs.generate-matrices.outputs.matrix) }}
+      matrix: ${{ fromJson(needs.generate-matrices.outputs.matrix).withoutPlatform }}
 
     steps:
       - uses: actions/checkout@v4
@@ -67,7 +67,7 @@ jobs:
 
     strategy:
       fail-fast: false
-      matrix: ${{ fromJson(needs.generate-matrices.outputs.matrix) }}
+      matrix: ${{ fromJson(needs.generate-matrices.outputs.matrix).withPlatform }}
 
     steps:
       - uses: actions/checkout@v4

diff --git a/Sources/BuildTool/BuildTool.swift b/Sources/BuildTool/BuildTool.swift
@@ -99,18 +99,25 @@ struct BuildAndTestLibrary: ParsableCommand {
 
 struct GenerateMatrices: ParsableCommand {
     mutating func run() throws {
+        let tooling = [
+            [
+                "xcode-version": "15.3",
+                "swift-version": 5,
+            ],
+            [
+                "xcode-version": "16-beta",
+                "swift-version": 6,
+            ],
+        ]
+
         let matrix: [String: Any] = [
-            "tooling": [
-                [
-                    "xcode-version": "15.3",
-                    "swift-version": 5,
-                ],
-                [
-                    "xcode-version": "16-beta",
-                    "swift-version": 6,
-                ],
+            "without-platform": [
+                "tooling": tooling,
+            ],
+            "with-platform": [
+                "tooling": tooling,
+                "platform": Platform.allCases.map(\.rawValue),
             ],
-            "platform": Platform.allCases.map(\.rawValue),
         ]
 
         // I’m assuming the JSONSerialization output has no newlines