merge: #3113

3113: Switch to the new engine r=nickgerace a=nickgerace ## Description Since July 2023, we have been dreaming of this moment. The changes in `new-engine` all hit `main`. This has been a journey of many squashed commits, bad git merges, pain, sweat and tears. That all changes today. Welcome to the new engine. ## History This PR is a continuation of #2879, which was closed because the branch was renamed to `new-engine`. Co-authored-by: Nick Gerace <[email protected]> Co-authored-by: Jacob Helwig <[email protected]>
systeminit · Mar 4, 2024 · d7517d0 · d7517d0
2 parents 5a4a4a2 + 9a055e6
commit d7517d0
Show file tree

Hide file tree

Showing 248 changed files with 39,955 additions and 17,414 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,3 +1,6 @@
+[build]
+rustflags = [ "--cfg", "tokio_unstable"]
+
 [target.x86_64-unknown-linux-gnu]
 rustflags = [
     "-C", "link-arg=-fuse-ld=lld",

diff --git a/.ci/docker-compose.test-integration.yml b/.ci/docker-compose.test-integration.yml
@@ -29,7 +29,7 @@ services:
       - "PGPASSWORD=bugbear"
       - "POSTGRES_USER=si_test"
       - "POSTGRES_DB=si_test"
-      - "POSTGRES_MULTIPLE_DBS=si_test_dal,si_test_sdf_server"
+      - "POSTGRES_MULTIPLE_DBS=si_test_content_store,si_test_dal,si_test_sdf_server"
     command:
       - "-c"
       - "fsync=off"