Skip to content

Commit

Permalink
Merge branch 'master' into cm/rework-c-keypath-filtering
Browse files Browse the repository at this point in the history
  • Loading branch information
jedelbo committed Nov 20, 2023
2 parents a0a4d37 + 0620493 commit c0b6c00
Show file tree
Hide file tree
Showing 51 changed files with 2,890 additions and 1,122 deletions.
3 changes: 2 additions & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@
## ☑️ ToDos
* [ ] 📝 Changelog update
* [ ] 🚦 Tests (or not relevant)
* [ ] C-API, if public C++ API changed.
* [ ] C-API, if public C++ API changed
* [ ] `bindgen/spec.yml`, if public C++ API changed
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -103,3 +103,7 @@ compile_commands.json
/bindgen/generated/
node_modules/
tsconfig.tsbuildinfo

# Baas remote host artifacts
baas-work-dir/
ssh_agent_commands.sh
27 changes: 26 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,31 @@

### Fixed
* <How do the end-user experience this issue? what was the impact?> ([#????](https://github.com/realm/realm-core/issues/????), since v?.?.?)
* `Set::assign_intersection()` on `Set<StringData>`, `Set<BinaryData>`, and `Set<Mixed>` containing string or binary would cause a use-after-free if a set was intersected with itself ([PR #7144](https://github.com/realm/realm-core/pull/7144), since v10.0.0).
* Set algebra on `Set<StringData>` and `Set<BinaryData>` gave incorrect results when used on platforms where `char` is signed ([#7135](https://github.com/realm/realm-core/issues/7135), since v13.23.3).

### Breaking changes
* None.

### Compatibility
* Fileformat: Generates files with format v23. Reads and automatically upgrade from fileformat v5.

-----------

### Internals
* None.

----------------------------------------------

# 13.23.4 Release notes

### Enhancements
* None.

### Fixed
* A crash at a very specific time during a DiscardLocal client reset on a FLX Realm could leave subscriptions in an invalid state ([#7110](https://github.com/realm/realm-core/pull/7110), since v12.3.0).
* Fixed an error "Invalid schema change (UPLOAD): cannot process AddColumn instruction for non-existent table" when using automatic client reset with recovery in dev mode to recover schema changes made locally while offline. ([#7042](https://github.com/realm/realm-core/pull/7042) since the server introduced the feature that allows client to redefine the server's schema if the server is in dev mode - fall 2023)
* Fix missing symbol linker error for `Set<ObjKey>` when building with Clang and LTO enabled ([#7121](https://github.com/realm/realm-core/pull/7121), since v12.23.3).

### Breaking changes
* None.
Expand All @@ -18,7 +41,9 @@
-----------

### Internals
* None.
* Add baas-network-tests nightly task for testing sync client operation with non-ideal network conditions. ([PR #6852](https://github.com/realm/realm-core/pull/6852))
* Added non-ideal network conditions and network fault tests to the evergreen nightly test runs. ([PR #7063](https://github.com/realm/realm-core/pull/7063))
* Updated baas tests to run with dev mode disabled by default. ([PR #6852](https://github.com/realm/realm-core/pull/6852))

----------------------------------------------

Expand Down
9 changes: 6 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ jobWrapper {
]
if (releaseTesting) {
extendedChecks = [
checkMacOsDebug : doBuildMacOs(buildOptions + [buildType: "Release"]),
checkMacOsDebug : doBuildMacOs(buildOptions + [buildType: "Debug"]),
checkAndroidarmeabiDebug : doAndroidBuildInDocker('armeabi-v7a', 'Debug', TestAction.Run),
// FIXME: https://github.com/realm/realm-core/issues/4159
//checkAndroidx86Release : doAndroidBuildInDocker('x86', 'Release', TestAction.Run),
Expand Down Expand Up @@ -606,8 +606,11 @@ def doBuildMacOs(Map options = [:]) {

dir('build-macosx') {
withEnv(['DEVELOPER_DIR=/Applications/Xcode-14.app/Contents/Developer/']) {
sh "cmake ${cmakeDefinitions} -G Xcode .."

try {
sh "cmake ${cmakeDefinitions} -G Xcode .."
} catch(Exception e) {
archiveArtifacts '**/*'
}
runAndCollectWarnings(
parser: 'clang',
script: "cmake --build . --config ${buildType} --target package -- ONLY_ACTIVE_ARCH=NO -destination generic/name=macOS -sdk macosx",
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import PackageDescription
import Foundation

let versionStr = "13.23.3"
let versionStr = "13.23.4"
let versionPieces = versionStr.split(separator: "-")
let versionCompontents = versionPieces[0].split(separator: ".")
let versionExtra = versionPieces.count > 1 ? versionPieces[1] : ""
Expand Down
1 change: 1 addition & 0 deletions bindgen/spec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -998,6 +998,7 @@ classes:
insert_any: '(list_ndx: count_t, value: Mixed)'
insert_embedded: '(ndx: count_t) -> Obj'
set_any: '(list_ndx: count_t, value: Mixed)'
set_embedded: '(list_ndx: count_t) -> Obj'
filter: '(q: Query) const -> Results'
freeze: '(frozen_realm: SharedRealm const&) const -> List'

Expand Down
2 changes: 1 addition & 1 deletion dependencies.list
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PACKAGE_NAME=realm-core
VERSION=13.23.3
VERSION=13.23.4
OPENSSL_VERSION=3.0.8
ZLIB_VERSION=1.2.13
MDBREALM_TEST_SERVER_TAG=2023-10-20
Loading

0 comments on commit c0b6c00

Please sign in to comment.