Merge branch 'merge-1.88' into beeper

beeper · Jul 27, 2023 · a9e6301 · a9e6301
2 parents 38f8398 + 384dc85
commit a9e6301
Show file tree

Hide file tree

Showing 215 changed files with 11,830 additions and 7,688 deletions.
diff --git a/.ci/scripts/calculate_jobs.py b/.ci/scripts/calculate_jobs.py
@@ -29,11 +29,12 @@ def set_output(key: str, value: str):
 
 # First calculate the various trial jobs.
 #
-# For each type of test we only run on Py3.7 on PRs
+# For PRs, we only run each type of test with the oldest Python version supported (which
+# is Python 3.8 right now)
 
 trial_sqlite_tests = [
     {
-        "python-version": "3.7",
+        "python-version": "3.8",
         "database": "sqlite",
         "extras": "all",
     }
@@ -46,13 +47,13 @@ def set_output(key: str, value: str):
             "database": "sqlite",
             "extras": "all",
         }
-        for version in ("3.8", "3.9", "3.10", "3.11")
+        for version in ("3.9", "3.10", "3.11")
     )
 
 
 trial_postgres_tests = [
     {
-        "python-version": "3.7",
+        "python-version": "3.8",
         "database": "postgres",
         "postgres-version": "11",
         "extras": "all",
@@ -71,7 +72,7 @@ def set_output(key: str, value: str):
 
 trial_no_extra_tests = [
     {
-        "python-version": "3.7",
+        "python-version": "3.8",
         "database": "sqlite",
         "extras": "",
     }
@@ -133,11 +134,6 @@ def set_output(key: str, value: str):
                 "sytest-tag": "testing",
                 "postgres": "postgres",
             },
-            {
-                "sytest-tag": "buster",
-                "postgres": "multi-postgres",
-                "workers": "workers",
-            },
         ]
     )
 

diff --git a/.github/workflows/beeper-ci.yml b/.github/workflows/beeper-ci.yml
@@ -45,7 +45,7 @@ jobs:
         - ${{ github.workspace }}:/src
       env:
         # Pinned at: https://github.com/matrix-org/sytest/commit/3b0208a1ced1da95d46d88881ebe90f5696b8e27
-        SYTEST_BRANCH: 3b0208a1ced1da95d46d88881ebe90f5696b8e27
+        SYTEST_BRANCH: 50544bb329119be48643396e65bac585c554903f
         TOP: ${{ github.workspace }}
         POSTGRES: 1
         MULTI_POSTGRES: 1
@@ -75,7 +75,7 @@ jobs:
         with:
           repository: matrix-org/complement
           path: complement
-          ref: bcc2bcef25fd31c5ee40c03aba1060e563f09004
+          ref: f032b6cef0e47d4222eb9028459c036ab8257d14
       - name: Install complement dependencies
         run: |-
           sudo apt-get -qq update

diff --git a/.gitignore b/.gitignore
@@ -34,6 +34,7 @@ __pycache__/
 /logs
 /media_store/
 /uploads
+/homeserver-config-overrides.d
 
 # For direnv users
 /.envrc

diff --git a/CHANGES.md b/CHANGES.md
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,3 +3,4 @@
 
 [workspace]
 members = ["rust"]
+resolver = "2"