Skip to content

Commit f5fa80e

Browse files
pblazejclaude
andauthored
Fix snapshot builds (#963)
Haven't found a better workaround yet - it's more about testing newer Swift than SPM itself. --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent f709111 commit f5fa80e

5 files changed

Lines changed: 15 additions & 11 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
run:
9797
shell: bash
9898
steps:
99-
- uses: actions/checkout@v4
99+
- uses: actions/checkout@v6
100100

101101
- name: Install LiveKit Server
102102
run: brew install livekit
@@ -179,7 +179,7 @@ jobs:
179179
name: Lint
180180
runs-on: macos-latest
181181
steps:
182-
- uses: actions/checkout@v4
182+
- uses: actions/checkout@v6
183183
- name: Install SwiftLint
184184
run: brew install swiftlint
185185
- name: SwiftLint
@@ -195,7 +195,7 @@ jobs:
195195
runs-on: macos-15
196196
steps:
197197
- name: Checkout Documentation Catalog
198-
uses: actions/checkout@v4
198+
uses: actions/checkout@v6
199199
with:
200200
sparse-checkout: Sources/LiveKit/LiveKit.docc
201201

@@ -230,7 +230,7 @@ jobs:
230230
name: Check Protocol
231231
runs-on: macos-latest
232232
steps:
233-
- uses: actions/checkout@v4
233+
- uses: actions/checkout@v6
234234
with:
235235
submodules: recursive
236236

@@ -260,7 +260,7 @@ jobs:
260260
contents: read
261261
pull-requests: write
262262
steps:
263-
- uses: actions/checkout@v4
263+
- uses: actions/checkout@v6
264264
with:
265265
fetch-depth: 0
266266

.github/workflows/cocoapods-lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
timeout-minutes: 30
2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v6
2828
- name: Setup CocoaPods
2929
uses: maxim-lobanov/setup-cocoapods@v1
3030
with:

.github/workflows/publish-docs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
artifact_name: symbol-graph-macos
3030
steps:
3131
- name: Checkout
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@v6
3333
with:
3434
ref: ${{ github.event_name == 'release' && github.event.release.tag_name || github.event.inputs.ref || 'main' }}
3535
fetch-depth: 0
@@ -63,7 +63,7 @@ jobs:
6363
runs-on: macos-26
6464
steps:
6565
- name: Checkout
66-
uses: actions/checkout@v4
66+
uses: actions/checkout@v6
6767
with:
6868
ref: ${{ github.event_name == 'release' && github.event.release.tag_name || github.event.inputs.ref || 'main' }}
6969
fetch-depth: 0

.github/workflows/swift-snapshot.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
run:
2121
shell: bash
2222
steps:
23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v6
2424

2525
- uses: maxim-lobanov/setup-xcode@v1
2626
with:
@@ -33,4 +33,7 @@ jobs:
3333
run: swiftly install -y ${{ env.SWIFT_SNAPSHOT }}
3434

3535
- name: Build
36-
run: swiftly run swift build +${{ env.SWIFT_SNAPSHOT }}
36+
# --build-system native avoids a SwiftBuild resource-bundle crash
37+
# ("unable to find bundle named SwiftBuild_SWBUniversalPlatform")
38+
# seen in recent main-snapshot toolchains on the CI image.
39+
run: swiftly run swift build +${{ env.SWIFT_SNAPSHOT }} --build-system native

Sources/LiveKit/Agent/Session.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,10 @@ open class Session: ObservableObject {
119119
senders: [any MessageSender]?,
120120
receivers: [any MessageReceiver]?)
121121
{
122+
let room = options.room
122123
self.tokenSourceConfiguration = tokenSourceConfiguration
123124
self.options = options
124-
room = options.room
125+
self.room = room
125126

126127
let textMessageSender = TextMessageSender(room: room)
127128
let resolvedSenders = senders ?? [textMessageSender]

0 commit comments

Comments
 (0)