Skip to content

Commit

Permalink
Fix SPM CI tests
Browse files Browse the repository at this point in the history
  • Loading branch information
groue committed Sep 28, 2024
1 parent b389547 commit ebdd1f1
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ endif

test_SPM:
# Add sanitizers when available: https://twitter.com/simjp/status/929140877540278272
rm -rf Tests/products
$(SWIFT) package clean
$(SWIFT) build
$(SWIFT) build -c release
Expand Down Expand Up @@ -280,11 +281,13 @@ test_install_manual:
test_install_SPM: test_install_SPM_Package test_install_SPM_Project test_install_SPM_Dynamic_Project test_install_SPM_macos_release test_install_SPM_ios_release

test_install_SPM_Package:
rm -rf Tests/products
cd Tests/SPM/PlainPackage && \
$(SWIFT) build && \
./.build/debug/SPM

test_install_SPM_Project:
rm -rf Tests/products
$(XCODEBUILD) \
-project Tests/SPM/PlainProject/Plain.xcodeproj \
-scheme Plain \
Expand All @@ -294,6 +297,7 @@ test_install_SPM_Project:
$(XCPRETTY)

test_install_SPM_Dynamic_Project:
rm -rf Tests/products
$(XCODEBUILD) \
-project Tests/SPM/ios-dynamic/ios-dynamic.xcodeproj \
-scheme ios-dynamic \
Expand All @@ -303,6 +307,7 @@ test_install_SPM_Dynamic_Project:
$(XCPRETTY)

test_install_SPM_macos_release:
rm -rf Tests/products
$(XCODEBUILD) \
-project Tests/SPM/macos/macos.xcodeproj \
-scheme macos \
Expand All @@ -312,6 +317,7 @@ test_install_SPM_macos_release:
$(XCPRETTY)

test_install_SPM_ios_release:
rm -rf Tests/products
$(XCODEBUILD) \
-project Tests/SPM/ios/ios.xcodeproj \
-scheme ios \
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ let package = Package(
"Info.plist",
"Performance",
"SPM",
"Swift6Migration",
"generatePerformanceReport.rb",
"parsePerformanceTests.rb",
"products",
],
resources: [
.copy("GRDBTests/Betty.jpeg"),
Expand Down
2 changes: 1 addition & 1 deletion TODO.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
- [X] GRDB7: bump to iOS 13, macOS 10.15, tvOS 13 (for ValueObservation support for MainActor)

- [ ] GRDB7: DatabasePublishers.Value should carry the type of the Reducer, so that we can rely on main-actor-isolated callbacks.
- [ ] GRDB7: Remove warning about "products" in Package.swift
- [X] GRDB7: Remove warning about "products" in Package.swift
- [X] GRDB7: Fixits
- [X] defaultTransactionKind
- [X] concurrentRead
Expand Down

0 comments on commit ebdd1f1

Please sign in to comment.