Skip to content

Commit 29c4978

Browse files
committed
CI refactor
1 parent 5997c46 commit 29c4978

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

.github/workflows/ci.yml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,27 @@ on:
99
schedule:
1010
- cron: '0 6,18 * * *'
1111
jobs:
12-
darwin-android:
12+
linux:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v4
16+
- run: swift test
17+
android:
1318
# emulator fails to launch on ARM macOS with: HVF error: HV_UNSUPPORTED
14-
#runs-on: macos-15
15-
# so we need to run on Intel macOS
19+
# so we need to run on Intel macOS, which is macos-13
1620
runs-on: macos-13
1721
steps:
1822
- uses: actions/checkout@v4
19-
- name: "Test Swift Package Locally"
20-
run: swift test
21-
- name: "Test Swift Package on Android"
23+
- name: "Test Swift Package Android"
2224
uses: skiptools/swift-android-action@v1
23-
- name: "Test Swift Package on iOS"
24-
run: xcodebuild test -sdk "iphonesimulator" -destination "platform=iOS Simulator,name=iPhone 15" -scheme "$(xcodebuild -list -json | jq -r '.workspace.schemes[-1]')"
25-
linux:
26-
runs-on: ubuntu-latest
25+
macos-ios:
26+
runs-on: macos-latest
2727
steps:
2828
- uses: actions/checkout@v4
29-
- run: swift test
29+
- name: "Test Swift Package macOS"
30+
run: swift test
31+
- name: "Test Swift Package iOS"
32+
run: xcodebuild test -sdk "iphonesimulator" -destination "platform=iOS Simulator,name=iPhone 15" -scheme "$(xcodebuild -list -json | jq -r '.workspace.schemes[-1]')"
3033
windows:
3134
runs-on: windows-latest
3235
steps:

Tests/SQLiteDBTests/Extensions/CipherTests.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,10 @@ class CipherTests: XCTestCase {
9191
#endif
9292

9393
defer {
94+
#if !os(Android) && !os(Linux) && !os(Windows) // file permission modification unsupported on non-Darwin platforms
9495
// ensure file can be cleaned up afterwards
9596
try? FileManager.default.setAttributes([FileAttributeKey.immutable: 0], ofItemAtPath: encryptedFile)
97+
#endif
9698
}
9799

98100
let conn = try Connection(encryptedFile)

0 commit comments

Comments
 (0)