diff --git a/.jenkins.yml b/.jenkins.yml index fcdd5dd1d36..02095fc58a4 100644 --- a/.jenkins.yml +++ b/.jenkins.yml @@ -12,33 +12,11 @@ xcode_version: target: - docs - swiftlint - - osx - - osx-encryption - - osx-object-server - swiftpm - swiftpm-debug - swiftpm-address - swiftpm-thread - swiftpm-ios - - ios-static - - ios-dynamic - - watchos - - tvos - - osx-swift - - ios-swift - - tvos-swift - - osx-swift-evolution - - ios-swift-evolution - - tvos-swift-evolution - - catalyst - - catalyst-swift - - xcframework - - cocoapods-osx - - cocoapods-ios - - cocoapods-ios-dynamic - - cocoapods-watchos - - swiftui-ios - - swiftui-server-osx configuration: - N/A @@ -68,27 +46,6 @@ exclude: - xcode_version: 14.0.1 target: swiftlint - - xcode_version: 13.1 - target: osx-encryption - - - xcode_version: 13.2.1 - target: osx-encryption - - - xcode_version: 13.4.1 - target: osx-encryption - - - xcode_version: 14.0.1 - target: osx-encryption - - - xcode_version: 13.2.1 - target: osx-object-server - - - xcode_version: 13.4.1 - target: osx-object-server - - - xcode_version: 14.0.1 - target: osx-object-server - - xcode_version: 13.2.1 target: swiftpm @@ -133,174 +90,3 @@ exclude: - xcode_version: 14.0.1 target: swiftpm-ios - - - xcode_version: 13.2.1 - target: ios-static - - - xcode_version: 13.4.1 - target: ios-static - - - xcode_version: 14.0.1 - target: ios-static - - - xcode_version: 13.2.1 - target: ios-dynamic - - - xcode_version: 13.4.1 - target: ios-dynamic - - - xcode_version: 14.0.1 - target: ios-dynamic - - - xcode_version: 13.2.1 - target: watchos - - - xcode_version: 13.4.1 - target: watchos - - - xcode_version: 14.0.1 - target: watchos - - - xcode_version: 13.2.1 - target: tvos - - - xcode_version: 13.4.1 - target: tvos - - - xcode_version: 14.0.1 - target: tvos - - - xcode_version: 13.2.1 - target: ios-swift - - - xcode_version: 13.4.1 - target: ios-swift - - - xcode_version: 14.0.1 - target: ios-swift - - - xcode_version: 13.2.1 - target: tvos-swift - - - xcode_version: 13.4.1 - target: tvos-swift - - - xcode_version: 14.0.1 - target: tvos-swift - - - xcode_version: 13.1 - target: osx-swift-evolution - - - xcode_version: 13.2.1 - target: osx-swift-evolution - - - xcode_version: 13.4.1 - target: osx-swift-evolution - - - xcode_version: 14.0.1 - target: osx-swift-evolution - - - xcode_version: 13.1 - target: ios-swift-evolution - - - xcode_version: 13.2.1 - target: ios-swift-evolution - - - xcode_version: 13.4.1 - target: ios-swift-evolution - - - xcode_version: 14.0.1 - target: ios-swift-evolution - - - xcode_version: 13.1 - target: tvos-swift-evolution - - - xcode_version: 13.2.1 - target: tvos-swift-evolution - - - xcode_version: 13.4.1 - target: tvos-swift-evolution - - - xcode_version: 14.0.1 - target: tvos-swift-evolution - - - xcode_version: 13.2.1 - target: catalyst - - - xcode_version: 13.4.1 - target: catalyst - - - xcode_version: 14.0.1 - target: catalyst - - - xcode_version: 13.2.1 - target: catalyst-swift - - - xcode_version: 13.4.1 - target: catalyst-swift - - - xcode_version: 14.0.1 - target: catalyst-swift - - - xcode_version: 13.1 - target: xcframework - - - xcode_version: 13.2.1 - target: xcframework - - - xcode_version: 13.4.1 - target: xcframework - - - xcode_version: 14.0.1 - target: xcframework - - - xcode_version: 13.2.1 - target: cocoapods-ios - - - xcode_version: 13.4.1 - target: cocoapods-ios - - - xcode_version: 14.0.1 - target: cocoapods-ios - - - xcode_version: 13.2.1 - target: cocoapods-ios-dynamic - - - xcode_version: 13.4.1 - target: cocoapods-ios-dynamic - - - xcode_version: 14.0.1 - target: cocoapods-ios-dynamic - - - xcode_version: 13.2.1 - target: cocoapods-watchos - - - xcode_version: 13.4.1 - target: cocoapods-watchos - - - xcode_version: 14.0.1 - target: cocoapods-watchos - - - xcode_version: 13.1 - target: swiftui-ios - - - xcode_version: 13.2.1 - target: swiftui-ios - - - xcode_version: 13.4.1 - target: swiftui-ios - - - xcode_version: 14.0.1 - target: swiftui-ios - - - xcode_version: 13.1 - target: swiftui-server-osx - - - xcode_version: 13.2.1 - target: swiftui-server-osx - - - xcode_version: 13.4.1 - target: swiftui-server-osx - - - xcode_version: 14.0.1 - target: swiftui-server-osx diff --git a/Package.swift b/Package.swift index 56b8a1f5405..564a14421eb 100644 --- a/Package.swift +++ b/Package.swift @@ -114,7 +114,7 @@ let package = Package( targets: ["Realm", "RealmSwift"]), ], dependencies: [ - .package(name: "RealmDatabase", url: "https://github.com/realm/realm-core", .branch("tg/exception-unification")) + .package(name: "RealmDatabase", url: "https://github.com/realm/realm-core", .branch("feature/exception-unification")) ], targets: [ .target( diff --git a/scripts/pr-ci-matrix.rb b/scripts/pr-ci-matrix.rb index 99edfbc95b9..aff292995d6 100755 --- a/scripts/pr-ci-matrix.rb +++ b/scripts/pr-ci-matrix.rb @@ -14,41 +14,11 @@ def minimum_version(major) 'docs' => latest_only, 'swiftlint' => latest_only, - 'osx' => all, - 'osx-encryption' => latest_only, - 'osx-object-server' => oldest_and_latest, - 'swiftpm' => oldest_and_latest, 'swiftpm-debug' => all, 'swiftpm-address' => latest_only, 'swiftpm-thread' => latest_only, 'swiftpm-ios' => latest_only, - - 'ios-static' => oldest_and_latest, - 'ios-dynamic' => oldest_and_latest, - 'watchos' => oldest_and_latest, - 'tvos' => oldest_and_latest, - - 'osx-swift' => all, - 'ios-swift' => oldest_and_latest, - 'tvos-swift' => oldest_and_latest, - - 'osx-swift-evolution' => latest_only, - 'ios-swift-evolution' => latest_only, - 'tvos-swift-evolution' => latest_only, - - 'catalyst' => oldest_and_latest, - 'catalyst-swift' => oldest_and_latest, - - 'xcframework' => latest_only, - - 'cocoapods-osx' => all, - 'cocoapods-ios' => oldest_and_latest, - 'cocoapods-ios-dynamic' => oldest_and_latest, - 'cocoapods-watchos' => oldest_and_latest, - # 'cocoapods-catalyst' => oldest_and_latest, - 'swiftui-ios' => latest_only, - 'swiftui-server-osx' => latest_only, } output_file = """