Skip to content

Commit e247227

Browse files
committed
Use traits for package test
1 parent e5f413a commit e247227

2 files changed

Lines changed: 13 additions & 6 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ${{ matrix.os }}
1818
env:
1919
IOS_SIMULATOR: ${{ matrix.os == 'macos-15' && 'iPhone 16' || 'iPhone 16e' }}
20-
IOS_VERSION: ${{ matrix.os == 'macos-15' && '18.4' || '26.2' }}
20+
IOS_VERSION: ${{ matrix.os == 'macos-15' && '18.4' || '26.0' }}
2121
steps:
2222
- uses: actions/checkout@v4
2323
- name: "Lint"
@@ -71,7 +71,7 @@ jobs:
7171
sudo apt-get update -qq
7272
sudo apt-get install -y libsqlite3-dev
7373
- name: Test
74-
run: swift test
74+
run: swift test --traits SwiftToolchainCSQLite
7575
- name: "Run tests (SPM integration test)"
7676
env:
7777
SPM: run

Tests/SPM/Package.swift

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,26 @@
1-
// swift-tools-version:5.7
1+
// swift-tools-version:6.1
22
// The swift-tools-version declares the minimum version of Swift required to build this package.
33

44
import PackageDescription
55

6+
let traits: Set<Package.Dependency.Trait>
7+
#if os(Linux)
8+
traits = ["SwiftToolchainCSQLite"]
9+
#else
10+
traits = [.defaults]
11+
#endif
12+
613
let package = Package(
714
name: "test",
815
platforms: [
9-
.iOS(.v11),
16+
.iOS(.v12),
1017
.macOS(.v10_13),
1118
.watchOS(.v4),
12-
.tvOS(.v11)
19+
.tvOS(.v12)
1320
],
1421
dependencies: [
1522
// for testing from same repository
16-
.package(path: "../..")
23+
.package(path: "../..", traits: traits)
1724
// normally this would be:
1825
// .package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.15.4")
1926
],

0 commit comments

Comments
 (0)