Merge pull request #1339 from stephencelis/run-all-tests

jberkel · web-flow · commit 8750f1bd6094 · 2026-01-11T21:23:26.000+01:00
Run all tests + update
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,13 +1,22 @@
 name: Build and test
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+concurrency:
+  group: ci-${{ github.ref }}
+  cancel-in-progress:  ${{ github.ref != 'refs/heads/master' }}
 env:
   IOS_SIMULATOR: "iPhone 16"
   IOS_VERSION: "18.4"
 jobs:
   build:
     runs-on: macos-15
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: "Lint"
       run: make lint
     - name: "Run tests (PACKAGE_MANAGER_COMMAND: test)"
@@ -42,30 +51,10 @@ jobs:
       env:
         VALIDATOR_SUBSPEC: SQLCipher
       run: ./run-tests.sh
-    - name: "Run tests (CARTHAGE_PLATFORM: iOS)"
-      env:
-        CARTHAGE_PLATFORM: iOS
-      run: ./run-tests.sh
-    - name: "Run tests (CARTHAGE_PLATFORM: Mac)"
-      env:
-        CARTHAGE_PLATFORM: Mac
-      run: ./run-tests.sh
-    - name: "Run tests (CARTHAGE_PLATFORM: watchOS)"
-      env:
-        CARTHAGE_PLATFORM: watchOS
-      run: ./run-tests.sh
-    - name: "Run tests (CARTHAGE_PLATFORM: tvOS)"
-      env:
-        CARTHAGE_PLATFORM: tvOS
-      run: ./run-tests.sh
-    - name: "Run tests (CARTHAGE_PLATFORM: visionOS)"
-      env:
-        CARTHAGE_PLATFORM: visionOS
-      run: ./run-tests.sh
   build-linux:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Install
       run: |
         sudo apt-get update -qq
@@ -79,6 +68,9 @@ jobs:
   build-android:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Run tests
+    - uses: actions/checkout@v4
+    - name: Run tests on Android
       uses: skiptools/swift-android-action@v2
+      with:
+        # Ubuntu runners low on space causes the emulator to fail to install
+        free-disk-space: true
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -25,11 +25,8 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.7)
-      base64
-      nkf
-      rexml
-    activesupport (7.2.2.1)
+    CFPropertyList (3.0.8)
+    activesupport (7.2.3)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -41,15 +38,15 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.8.8)
+      public_suffix (>= 2.0.2, < 8.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
-    base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
+    base64 (0.3.0)
+    benchmark (0.5.0)
+    bigdecimal (4.0.1)
     claide (1.1.0)
     cocoapods-core (1.16.2)
       activesupport (>= 5.0, < 8)
@@ -71,32 +68,34 @@ GEM
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
+    concurrent-ruby (1.3.6)
+    connection_pool (3.0.2)
     drb (2.2.3)
     escape (0.0.4)
-    ethon (0.16.0)
+    ethon (0.18.0)
       ffi (>= 1.15.0)
-    ffi (1.17.2)
-    ffi (1.17.2-arm64-darwin)
+      logger
+    ffi (1.17.3)
+    ffi (1.17.3-arm64-darwin)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     httpclient (2.9.0)
       mutex_m
-    i18n (1.14.7)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
-    json (2.12.0)
+    json (2.18.0)
     logger (1.7.0)
-    minitest (5.25.5)
+    minitest (6.0.1)
+      prism (~> 1.5)
     molinillo (0.8.0)
     mutex_m (0.3.0)
     nanaimo (0.4.0)
     nap (1.1.0)
     netrc (0.11.0)
-    nkf (0.2.0)
+    prism (1.7.0)
     public_suffix (4.0.7)
-    rexml (3.4.1)
+    rexml (3.4.4)
     ruby-macho (4.1.0)
     securerandom (0.4.1)
     typhoeus (1.4.1)
diff --git a/SQLite.swift.podspec b/SQLite.swift.podspec
@@ -32,7 +32,7 @@ Pod::Spec.new do |s|
     
     ss.test_spec 'tests' do |test_spec|
       test_spec.resources = 'Tests/SQLiteTests/Resources/*'
-      test_spec.source_files = 'Tests/SQLiteTests/*.swift'
+      test_spec.source_files = 'Tests/SQLiteTests/**/*.swift'
     end
   end
 
@@ -49,7 +49,7 @@ Pod::Spec.new do |s|
     
     ss.test_spec 'tests' do |test_spec|
       test_spec.resources = 'Tests/SQLiteTests/Resources/*'
-      test_spec.source_files = 'Tests/SQLiteTests/*.swift'
+      test_spec.source_files = 'Tests/SQLiteTests/**/*.swift'
     end
   end
 
@@ -72,7 +72,7 @@ Pod::Spec.new do |s|
     
     ss.test_spec 'tests' do |test_spec|
       test_spec.resources = 'Tests/SQLiteTests/Resources/*'
-      test_spec.source_files = 'Tests/SQLiteTests/*.swift'
+      test_spec.source_files = 'Tests/SQLiteTests/**/*.swift'
     end
   end
 end
diff --git a/Sources/SQLite/Core/Backup.swift b/Sources/SQLite/Core/Backup.swift
@@ -24,9 +24,9 @@
 
 import Foundation
 import Dispatch
-#if SQLITE_SWIFT_STANDALONE
+#if canImport(sqlite3)
 import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
+#elseif canImport(SQLCipher)
 import SQLCipher
 #elseif canImport(SwiftToolchainCSQLite)
 import SwiftToolchainCSQLite
diff --git a/Sources/SQLite/Core/Connection+Aggregation.swift b/Sources/SQLite/Core/Connection+Aggregation.swift
@@ -1,7 +1,7 @@
 import Foundation
-#if SQLITE_SWIFT_STANDALONE
+#if canImport(sqlite3)
 import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
+#elseif canImport(SQLCipher)
 import SQLCipher
 #elseif canImport(SwiftToolchainCSQLite)
 import SwiftToolchainCSQLite
diff --git a/Sources/SQLite/Core/Connection+Attach.swift b/Sources/SQLite/Core/Connection+Attach.swift
@@ -1,13 +1,4 @@
 import Foundation
-#if SQLITE_SWIFT_STANDALONE
-import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
-import SQLCipher
-#elseif canImport(SwiftToolchainCSQLite)
-import SwiftToolchainCSQLite
-#else
-import SQLite3
-#endif
 
 extension Connection {
     #if SQLITE_SWIFT_SQLCIPHER
diff --git a/Sources/SQLite/Core/Connection.swift b/Sources/SQLite/Core/Connection.swift
@@ -24,9 +24,9 @@
 
 import Foundation
 import Dispatch
-#if SQLITE_SWIFT_STANDALONE
+#if canImport(sqlite3)
 import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
+#elseif canImport(SQLCipher)
 import SQLCipher
 #elseif canImport(SwiftToolchainCSQLite)
 import SwiftToolchainCSQLite
diff --git a/Sources/SQLite/Core/Result.swift b/Sources/SQLite/Core/Result.swift
@@ -1,6 +1,6 @@
-#if SQLITE_SWIFT_STANDALONE
+#if canImport(sqlite3)
 import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
+#elseif canImport(SQLCipher)
 import SQLCipher
 #elseif canImport(SwiftToolchainCSQLite)
 import SwiftToolchainCSQLite
diff --git a/Sources/SQLite/Core/Statement.swift b/Sources/SQLite/Core/Statement.swift
@@ -22,9 +22,9 @@
 // THE SOFTWARE.
 //
 
-#if SQLITE_SWIFT_STANDALONE
+#if canImport(sqlite3)
 import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
+#elseif canImport(SQLCipher)
 import SQLCipher
 #elseif canImport(SwiftToolchainCSQLite)
 import SwiftToolchainCSQLite
diff --git a/Sources/SQLite/Helpers.swift b/Sources/SQLite/Helpers.swift
@@ -22,9 +22,9 @@
 // THE SOFTWARE.
 //
 
-#if SQLITE_SWIFT_STANDALONE
+#if canImport(sqlite3)
 import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
+#elseif canImport(SQLCipher)
 import SQLCipher
 #elseif canImport(SwiftToolchainCSQLite)
 import SwiftToolchainCSQLite
diff --git a/Tests/SQLiteTests/Core/Connection+AttachTests.swift b/Tests/SQLiteTests/Core/Connection+AttachTests.swift
@@ -2,9 +2,9 @@ import XCTest
 import Foundation
 @testable import SQLite
 
-#if SQLITE_SWIFT_STANDALONE
+#if canImport(sqlite3)
 import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
+#elseif canImport(SQLCipher)
 import SQLCipher
 #elseif canImport(SwiftToolchainCSQLite)
 import SwiftToolchainCSQLite
diff --git a/Tests/SQLiteTests/Core/Connection+PragmaTests.swift b/Tests/SQLiteTests/Core/Connection+PragmaTests.swift
@@ -2,16 +2,6 @@ import XCTest
 import Foundation
 @testable import SQLite
 
-#if SQLITE_SWIFT_STANDALONE
-import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
-import SQLCipher
-#elseif canImport(SwiftToolchainCSQLite)
-import SwiftToolchainCSQLite
-#else
-import SQLite3
-#endif
-
 class ConnectionPragmaTests: SQLiteTestCase {
     func test_userVersion() {
         db.userVersion = 2
diff --git a/Tests/SQLiteTests/Core/ConnectionTests.swift b/Tests/SQLiteTests/Core/ConnectionTests.swift
@@ -3,9 +3,9 @@ import Foundation
 import Dispatch
 @testable import SQLite
 
-#if SQLITE_SWIFT_STANDALONE
+#if canImport(sqlite3)
 import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
+#elseif canImport(SQLCipher)
 import SQLCipher
 #elseif canImport(SwiftToolchainCSQLite)
 import SwiftToolchainCSQLite
@@ -444,4 +444,13 @@ class ConnectionTests: SQLiteTestCase {
         }
         semaphores.forEach { $0.wait() }
     }
+
+    #if SQLITE_SWIFT_STANDALONE
+    func test_standalone_version_is_recent() throws {
+        // when building standalone (= pod), we should have a more recent version
+        let conn = try Connection(.inMemory)
+        let version = conn.sqliteVersion
+        XCTAssertGreaterThanOrEqual(version, .init(major: 3, minor: 51))
+    }
+    #endif
 }
diff --git a/Tests/SQLiteTests/Core/ResultTests.swift b/Tests/SQLiteTests/Core/ResultTests.swift
@@ -2,9 +2,9 @@ import XCTest
 import Foundation
 @testable import SQLite
 
-#if SQLITE_SWIFT_STANDALONE
+#if canImport(sqlite3)
 import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
+#elseif canImport(SQLCipher)
 import SQLCipher
 #elseif canImport(SwiftToolchainCSQLite)
 import SwiftToolchainCSQLite
diff --git a/Tests/SQLiteTests/Core/StatementTests.swift b/Tests/SQLiteTests/Core/StatementTests.swift
@@ -1,9 +1,9 @@
 import XCTest
 @testable import SQLite
 
-#if SQLITE_SWIFT_STANDALONE
+#if canImport(sqlite3)
 import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
+#elseif canImport(SQLCipher)
 import SQLCipher
 #elseif canImport(SwiftToolchainCSQLite)
 import SwiftToolchainCSQLite
diff --git a/Tests/SQLiteTests/Extensions/CipherTests.swift b/Tests/SQLiteTests/Extensions/CipherTests.swift
@@ -108,11 +108,10 @@ class CipherTests: XCTestCase {
     }
 
     private func keyData(length: Int = 64) -> NSData {
-        let keyData = NSMutableData(length: length)!
-        let result  = SecRandomCopyBytes(kSecRandomDefault, length,
-                                         keyData.mutableBytes.assumingMemoryBound(to: UInt8.self))
-        XCTAssertEqual(0, result)
-        return NSData(data: keyData)
+        var bytes = [Int8](repeating: 0, count: length)
+        let result  = SecRandomCopyBytes(kSecRandomDefault, length, &bytes)
+        XCTAssertEqual(errSecSuccess, result)
+        return NSData(bytes: bytes, length: length)
     }
 }
 #endif
diff --git a/Tests/SQLiteTests/Extensions/FTSIntegrationTests.swift b/Tests/SQLiteTests/Extensions/FTSIntegrationTests.swift
@@ -1,13 +1,4 @@
 import XCTest
-#if SQLITE_SWIFT_STANDALONE
-import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
-import SQLCipher
-#elseif canImport(SwiftToolchainCSQLite)
-import SwiftToolchainCSQLite
-#else
-import SQLite3
-#endif
 @testable import SQLite
 
 class FTSIntegrationTests: SQLiteTestCase {
diff --git a/Tests/SQLiteTests/Typed/CustomAggregationTests.swift b/Tests/SQLiteTests/Typed/CustomAggregationTests.swift
@@ -3,16 +3,6 @@ import Foundation
 import Dispatch
 @testable import SQLite
 
-#if SQLITE_SWIFT_STANDALONE
-import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
-import SQLCipher
-#elseif canImport(SwiftToolchainCSQLite)
-import SwiftToolchainCSQLite
-#else
-import SQLite3
-#endif
-
 // https://github.com/stephencelis/SQLite.swift/issues/1071
 #if !(os(Linux) || os(Android))
 
diff --git a/Tests/SQLiteTests/Typed/QueryIntegrationTests.swift b/Tests/SQLiteTests/Typed/QueryIntegrationTests.swift
@@ -1,7 +1,7 @@
 import XCTest
-#if SQLITE_SWIFT_STANDALONE
+#if canImport(sqlite3)
 import sqlite3
-#elseif SQLITE_SWIFT_SQLCIPHER
+#elseif canImport(SQLCipher)
 import SQLCipher
 #elseif canImport(SwiftToolchainCSQLite)
 import SwiftToolchainCSQLite
diff --git a/Tests/SQLiteTests/Typed/QueryTests.swift b/Tests/SQLiteTests/Typed/QueryTests.swift
