Skip to content

Commit 789b677

Browse files
authored
Merge pull request #5 from mhayes853/update-ci
Update CI to use Swift 6.2
2 parents 02c3e05 + 36eee92 commit 789b677

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ jobs:
2727
2828
macos:
2929
name: macOS
30-
runs-on: macos-15
30+
runs-on: macos-26
3131
strategy:
3232
matrix:
33-
xcode: ["16.3"]
33+
xcode: ["26.0"]
3434
config: ["debug", "release"]
3535
steps:
3636
- uses: actions/checkout@v4
@@ -61,9 +61,10 @@ jobs:
6161
- name: "Test Swift Package on Android"
6262
uses: swift-android-sdk/swift-android-action@v2
6363
with:
64-
swift-version: 6.1
64+
swift-version: 6.2
6565
swift-build-flags: --traits SwiftUUIDV7Tagged,SwiftUUIDV7StructuredQueries,SwiftUUIDV7Dependencies
66-
swift-configuration: release
66+
swift-configuration: ${{ matrix.config }}
67+
run-tests: false # NB: Emulator booting seems to be flakey
6768

6869
windows:
6970
name: Windows
@@ -76,14 +77,15 @@ jobs:
7677
- name: "Setup Swift on Windows"
7778
uses: compnerd/gha-setup-swift@main
7879
with:
79-
branch: swift-6.1-release
80-
tag: 6.1-RELEASE
80+
branch: swift-6.2-release
81+
tag: 6.2-RELEASE
8182
- name: "Test Swift Package on Windows"
8283
run: swift test --configuration ${{ matrix.config }} --traits SwiftUUIDV7Tagged
8384

8485
wasm:
8586
name: WASM
8687
runs-on: ubuntu-latest
88+
container: swift:6.1.3
8789
steps:
8890
- uses: actions/checkout@v4
8991
- uses: swiftwasm/setup-swiftwasm@v2

Sources/UUIDV7/UUIDV7+GRDB.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
argumentCount: 1,
4040
pure: true
4141
) { args in
42-
TimeInterval.fromDatabaseValue(args[0]).map(UUIDV7.init(timeIntervalSince1970:))
42+
TimeInterval.fromDatabaseValue(args[0]).map { UUIDV7(timeIntervalSince1970: $0) }
4343
}
4444

4545
/// A SQL function that converts a ``UUIDV7`` to a date.

0 commit comments

Comments
 (0)