Skip to content

Commit 7b4d965

Browse files
realtyemrealtyem
committed
Merge branch 'develop' into unraid_develop
2 parents 965f5c5 + c7e29ca commit 7b4d965

Some content is hidden

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

64 files changed

+987
-241
lines changed

‎.github/workflows/latest_deps.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
steps:
2828
- uses: actions/checkout@v3
2929
- name: Install Rust
30-
uses: dtolnay/rust-toolchain@55c7845fad90d0ae8b2e83715cb900e5e861e8cb
30+
uses: dtolnay/rust-toolchain@e645b0cf01249a964ec099494d38d2da0f0b349f
3131
with:
3232
toolchain: stable
3333
- uses: Swatinem/rust-cache@v2
@@ -61,7 +61,7 @@ jobs:
6161
- uses: actions/checkout@v3
6262

6363
- name: Install Rust
64-
uses: dtolnay/rust-toolchain@55c7845fad90d0ae8b2e83715cb900e5e861e8cb
64+
uses: dtolnay/rust-toolchain@e645b0cf01249a964ec099494d38d2da0f0b349f
6565
with:
6666
toolchain: stable
6767
- uses: Swatinem/rust-cache@v2
@@ -134,7 +134,7 @@ jobs:
134134
- uses: actions/checkout@v3
135135

136136
- name: Install Rust
137-
uses: dtolnay/rust-toolchain@55c7845fad90d0ae8b2e83715cb900e5e861e8cb
137+
uses: dtolnay/rust-toolchain@e645b0cf01249a964ec099494d38d2da0f0b349f
138138
with:
139139
toolchain: stable
140140
- uses: Swatinem/rust-cache@v2

‎.github/workflows/push_complement_image.yml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# This task does not run complement tests, see tests.yaml instead.
2+
# This task does not build docker images for synapse for use on docker hub, see docker.yaml instead
3+
4+
name: Store complement-synapse image in ghcr.io
5+
on:
6+
push:
7+
branches: [ "master" ]
8+
schedule:
9+
- cron: '0 5 * * *'
10+
workflow_dispatch:
11+
inputs:
12+
branch:
13+
required: true
14+
default: 'develop'
15+
type: choice
16+
options:
17+
- develop
18+
- master
19+
20+
# Only run this action once per pull request/branch; restart if a new commit arrives.
21+
# C.f. https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#concurrency
22+
# and https://docs.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions#github-context
23+
concurrency:
24+
group: ${{ github.workflow }}-${{ github.ref }}
25+
cancel-in-progress: true
26+
27+
jobs:
28+
build:
29+
name: Build and push complement image
30+
runs-on: ubuntu-latest
31+
permissions:
32+
contents: read
33+
packages: write
34+
steps:
35+
- name: Checkout specific branch (debug build)
36+
uses: actions/checkout@v3
37+
if: 'github.event.type == "workflow_dispatch"'
38+
with:
39+
ref: ${{ inputs.branch }}
40+
- name: Checkout clean copy of develop (scheduled build)
41+
uses: actions/checkout@v3
42+
if: 'github.event.type == "schedule"'
43+
with:
44+
ref: develop
45+
- name: Checkout clean copy of master (on-push)
46+
uses: actions/checkout@v3
47+
if: 'github.event.type == "push"'
48+
with:
49+
ref: master
50+
- name: Login to registry
51+
uses: docker/login-action@v1
52+
with:
53+
registry: ghcr.io
54+
username: ${{ github.actor }}
55+
password: ${{ secrets.GITHUB_TOKEN }}
56+
- name: Work out labels for complement image
57+
id: meta
58+
uses: docker/metadata-action@v1
59+
with:
60+
images: ghcr.io/${{ github.repository }}/complement-synapse
61+
- name: Build complement image
62+
run: scripts-dev/complement.sh --build-only
63+
- name: Tag and push generated image
64+
run: |
65+
for TAG in ${{ steps.meta.outputs.tags }}; do
66+
docker tag complement-synapse:latest $TAG
67+
docker push $TAG
68+
done

‎.github/workflows/tests.yml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
rust:
3232
- 'rust/**'
3333
- 'Cargo.toml'
34+
- 'Cargo.lock'
3435
3536
check-sampleconfig:
3637
runs-on: ubuntu-latest
@@ -110,7 +111,7 @@ jobs:
110111
# There don't seem to be versioned releases of this action per se: for each rust
111112
# version there is a branch which gets constantly rebased on top of master.
112113
# We pin to a specific commit for paranoia's sake.
113-
uses: dtolnay/rust-toolchain@55c7845fad90d0ae8b2e83715cb900e5e861e8cb
114+
uses: dtolnay/rust-toolchain@e645b0cf01249a964ec099494d38d2da0f0b349f
114115
with:
115116
toolchain: 1.58.1
116117
components: clippy
@@ -130,7 +131,7 @@ jobs:
130131
# There don't seem to be versioned releases of this action per se: for each rust
131132
# version there is a branch which gets constantly rebased on top of master.
132133
# We pin to a specific commit for paranoia's sake.
133-
uses: dtolnay/rust-toolchain@55c7845fad90d0ae8b2e83715cb900e5e861e8cb
134+
uses: dtolnay/rust-toolchain@e645b0cf01249a964ec099494d38d2da0f0b349f
134135
with:
135136
toolchain: 1.58.1
136137
components: rustfmt
@@ -220,7 +221,7 @@ jobs:
220221
# There don't seem to be versioned releases of this action per se: for each rust
221222
# version there is a branch which gets constantly rebased on top of master.
222223
# We pin to a specific commit for paranoia's sake.
223-
uses: dtolnay/rust-toolchain@55c7845fad90d0ae8b2e83715cb900e5e861e8cb
224+
uses: dtolnay/rust-toolchain@e645b0cf01249a964ec099494d38d2da0f0b349f
224225
with:
225226
toolchain: 1.58.1
226227
- uses: Swatinem/rust-cache@v2
@@ -264,7 +265,7 @@ jobs:
264265
# There don't seem to be versioned releases of this action per se: for each rust
265266
# version there is a branch which gets constantly rebased on top of master.
266267
# We pin to a specific commit for paranoia's sake.
267-
uses: dtolnay/rust-toolchain@55c7845fad90d0ae8b2e83715cb900e5e861e8cb
268+
uses: dtolnay/rust-toolchain@e645b0cf01249a964ec099494d38d2da0f0b349f
268269
with:
269270
toolchain: 1.58.1
270271
- uses: Swatinem/rust-cache@v2
@@ -381,7 +382,7 @@ jobs:
381382
# There don't seem to be versioned releases of this action per se: for each rust
382383
# version there is a branch which gets constantly rebased on top of master.
383384
# We pin to a specific commit for paranoia's sake.
384-
uses: dtolnay/rust-toolchain@55c7845fad90d0ae8b2e83715cb900e5e861e8cb
385+
uses: dtolnay/rust-toolchain@e645b0cf01249a964ec099494d38d2da0f0b349f
385386
with:
386387
toolchain: 1.58.1
387388
- uses: Swatinem/rust-cache@v2
@@ -532,7 +533,7 @@ jobs:
532533
# There don't seem to be versioned releases of this action per se: for each rust
533534
# version there is a branch which gets constantly rebased on top of master.
534535
# We pin to a specific commit for paranoia's sake.
535-
uses: dtolnay/rust-toolchain@55c7845fad90d0ae8b2e83715cb900e5e861e8cb
536+
uses: dtolnay/rust-toolchain@e645b0cf01249a964ec099494d38d2da0f0b349f
536537
with:
537538
toolchain: 1.58.1
538539
- uses: Swatinem/rust-cache@v2
@@ -592,7 +593,7 @@ jobs:
592593
# There don't seem to be versioned releases of this action per se: for each rust
593594
# version there is a branch which gets constantly rebased on top of master.
594595
# We pin to a specific commit for paranoia's sake.
595-
uses: dtolnay/rust-toolchain@55c7845fad90d0ae8b2e83715cb900e5e861e8cb
596+
uses: dtolnay/rust-toolchain@e645b0cf01249a964ec099494d38d2da0f0b349f
596597
with:
597598
toolchain: 1.58.1
598599
- uses: Swatinem/rust-cache@v2

‎.github/workflows/twisted_trunk.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/checkout@v3
1919

2020
- name: Install Rust
21-
uses: dtolnay/rust-toolchain@55c7845fad90d0ae8b2e83715cb900e5e861e8cb
21+
uses: dtolnay/rust-toolchain@e645b0cf01249a964ec099494d38d2da0f0b349f
2222
with:
2323
toolchain: stable
2424
- uses: Swatinem/rust-cache@v2
@@ -43,7 +43,7 @@ jobs:
4343
- run: sudo apt-get -qq install xmlsec1
4444

4545
- name: Install Rust
46-
uses: dtolnay/rust-toolchain@55c7845fad90d0ae8b2e83715cb900e5e861e8cb
46+
uses: dtolnay/rust-toolchain@e645b0cf01249a964ec099494d38d2da0f0b349f
4747
with:
4848
toolchain: stable
4949
- uses: Swatinem/rust-cache@v2
@@ -82,7 +82,7 @@ jobs:
8282
- uses: actions/checkout@v3
8383

8484
- name: Install Rust
85-
uses: dtolnay/rust-toolchain@55c7845fad90d0ae8b2e83715cb900e5e861e8cb
85+
uses: dtolnay/rust-toolchain@e645b0cf01249a964ec099494d38d2da0f0b349f
8686
with:
8787
toolchain: stable
8888
- uses: Swatinem/rust-cache@v2

‎Cargo.lock‎

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎changelog.d/14038.misc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Prune user's old devices on login if they have too many.

‎changelog.d/14466.bugfix‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix a bug introduced in Synapse 1.70.0 where a receipt's thread ID was not sent over federation.

‎changelog.d/14469.misc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remove option to skip locking of tables when performing emulated upserts, to avoid a class of bugs in future.

‎changelog.d/14471.feature‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Move MSC3030 `/timestamp_to_event` endpoints to stable `v1` location (`/_matrix/client/v1/rooms/<roomID>/timestamp_to_event?ts=<timestamp>&dir=<direction>`, `/_matrix/federation/v1/timestamp_to_event/<roomID>?ts=<timestamp>&dir=<direction>`).

‎changelog.d/14509.docker‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Push complement-synapse docker images to ghcr.io repository.

0 commit comments

Comments
 (0)