Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 225675b

Browse files
committed
Merge branch 'develop' into madlittlemods/10975-r813183430-refactor-to-full-state-parameter
2 parents 878bdda + 8b7b371 commit 225675b

File tree

223 files changed

+5295
-2696
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

223 files changed

+5295
-2696
lines changed

.github/workflows/release-artifacts.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ jobs:
112112
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
113113
with:
114114
files: |
115-
python-dist/*
115+
Sdist/*
116+
Wheel/*
116117
debs.tar.xz
117118
# if it's not already published, keep the release as a draft.
118119
draft: true

.github/workflows/tests.yml

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ jobs:
377377
# Run Complement
378378
- run: |
379379
set -o pipefail
380-
go test -v -json -p 1 -tags synapse_blacklist,msc2403,msc2716,msc3030 ./tests/... 2>&1 | gotestfmt
380+
go test -v -json -tags synapse_blacklist,msc2403,msc2716,msc3030 ./tests/... 2>&1 | gotestfmt
381381
shell: bash
382382
name: Run Complement Tests
383383
env:
@@ -388,34 +388,22 @@ jobs:
388388
tests-done:
389389
if: ${{ always() }}
390390
needs:
391+
- check-sampleconfig
391392
- lint
392393
- lint-crlf
393394
- lint-newsfile
394395
- trial
395396
- trial-olddeps
396397
- sytest
398+
- export-data
397399
- portdb
398400
- complement
399401
runs-on: ubuntu-latest
400402
steps:
401-
- name: Set build result
402-
env:
403-
NEEDS_CONTEXT: ${{ toJSON(needs) }}
404-
# the `jq` incantation dumps out a series of "<job> <result>" lines.
405-
# we set it to an intermediate variable to avoid a pipe, which makes it
406-
# hard to set $rc.
407-
run: |
408-
rc=0
409-
results=$(jq -r 'to_entries[] | [.key,.value.result] | join(" ")' <<< $NEEDS_CONTEXT)
410-
while read job result ; do
411-
# The newsfile lint may be skipped on non PR builds
412-
if [ $result == "skipped" ] && [ $job == "lint-newsfile" ]; then
413-
continue
414-
fi
415-
416-
if [ "$result" != "success" ]; then
417-
echo "::set-failed ::Job $job returned $result"
418-
rc=1
419-
fi
420-
done <<< $results
421-
exit $rc
403+
- uses: matrix-org/done-action@v2
404+
with:
405+
needs: ${{ toJSON(needs) }}
406+
407+
# The newsfile lint may be skipped on non PR builds
408+
skippable:
409+
lint-newsfile

CHANGES.md

Lines changed: 139 additions & 1 deletion

README.rst

Lines changed: 3 additions & 0 deletions

changelog.d/11915.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/11998.doc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/12036.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Rename `shared_rooms` to `mutual_rooms` (MSC2666), as per proposal changes.

changelog.d/12038.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remove check on `update_user_directory` for shared rooms handler (MSC2666), and update/expand documentation.

changelog.d/12087.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix a long-standing bug which caused the `/_matrix/federation/v1/state` and `.../state_ids` endpoints to return incorrect or invalid data when called for an event which we have stored as an "outlier".

changelog.d/12090.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)