From ebdd1f1fdf3497fbe5ceb89e7083b3efd1b42f16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gwendal=20Roue=CC=81?= Date: Sat, 28 Sep 2024 09:06:56 +0200 Subject: [PATCH] Fix SPM CI tests --- Makefile | 6 ++++++ Package.swift | 2 +- TODO.md | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index db8b43313..9c91521f3 100644 --- a/Makefile +++ b/Makefile @@ -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 @@ -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 \ @@ -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 \ @@ -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 \ @@ -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 \ diff --git a/Package.swift b/Package.swift index f7f42d07b..a296279c7 100644 --- a/Package.swift +++ b/Package.swift @@ -71,9 +71,9 @@ let package = Package( "Info.plist", "Performance", "SPM", + "Swift6Migration", "generatePerformanceReport.rb", "parsePerformanceTests.rb", - "products", ], resources: [ .copy("GRDBTests/Betty.jpeg"), diff --git a/TODO.md b/TODO.md index 95f439ac7..b3c6974ed 100644 --- a/TODO.md +++ b/TODO.md @@ -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