Skip to content

Commit 7021a21

Browse files
committed
Merge branch 'develop' into 3767-time-based-notification-filtering
# Conflicts: # rust/Cargo.toml # synapse/config/experimental.py
2 parents b38d85c + 34a8652 commit 7021a21

File tree

235 files changed

+7427
-3100
lines changed

Some content is hidden

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

235 files changed

+7427
-3100
lines changed

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
run: docker buildx inspect
3131

3232
- name: Install Cosign
33-
uses: sigstore/cosign-installer@v3.3.0
33+
uses: sigstore/cosign-installer@v3.5.0
3434

3535
- name: Checkout repository
3636
uses: actions/checkout@v4

.github/workflows/docs-pr-netlify.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
# There's a 'download artifact' action, but it hasn't been updated for the workflow_run action
1515
# (https://github.com/actions/download-artifact/issues/60) so instead we get this mess:
1616
- name: 📥 Download artifact
17-
uses: dawidd6/action-download-artifact@e7466d1a7587ed14867642c2ca74b5bcc1e19a2d # v3.0.0
17+
uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe # v3.1.4
1818
with:
1919
workflow: docs-pr.yaml
2020
run_id: ${{ github.event.workflow_run.id }}

.github/workflows/docs-pr.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
fetch-depth: 0
2020

2121
- name: Setup mdbook
22-
uses: peaceiris/actions-mdbook@adeb05db28a0c0004681db83893d56c0388ea9ea # v1.2.0
22+
uses: peaceiris/actions-mdbook@ee69d230fe19748b7abf22df32acaa93833fad08 # v2.0.0
2323
with:
2424
mdbook-version: '0.4.17'
2525

@@ -53,7 +53,7 @@ jobs:
5353
- uses: actions/checkout@v4
5454

5555
- name: Setup mdbook
56-
uses: peaceiris/actions-mdbook@adeb05db28a0c0004681db83893d56c0388ea9ea # v1.2.0
56+
uses: peaceiris/actions-mdbook@ee69d230fe19748b7abf22df32acaa93833fad08 # v2.0.0
5757
with:
5858
mdbook-version: '0.4.17'
5959

.github/workflows/docs.yaml

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
fetch-depth: 0
5757

5858
- name: Setup mdbook
59-
uses: peaceiris/actions-mdbook@adeb05db28a0c0004681db83893d56c0388ea9ea # v1.2.0
59+
uses: peaceiris/actions-mdbook@ee69d230fe19748b7abf22df32acaa93833fad08 # v2.0.0
6060
with:
6161
mdbook-version: '0.4.17'
6262

@@ -80,38 +80,8 @@ jobs:
8080
8181
# Deploy to the target directory.
8282
- name: Deploy to gh pages
83-
uses: peaceiris/actions-gh-pages@373f7f263a76c20808c831209c920827a82a2847 # v3.9.3
83+
uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4.0.0
8484
with:
8585
github_token: ${{ secrets.GITHUB_TOKEN }}
8686
publish_dir: ./book
8787
destination_dir: ./${{ needs.pre.outputs.branch-version }}
88-
89-
################################################################################
90-
pages-devdocs:
91-
name: GitHub Pages (developer docs)
92-
runs-on: ubuntu-latest
93-
needs:
94-
- pre
95-
steps:
96-
- uses: actions/checkout@v4
97-
98-
- name: "Set up Sphinx"
99-
uses: matrix-org/setup-python-poetry@v1
100-
with:
101-
python-version: "3.x"
102-
poetry-version: "1.3.2"
103-
groups: "dev-docs"
104-
extras: ""
105-
106-
- name: Build the documentation
107-
run: |
108-
cd dev-docs
109-
poetry run make html
110-
111-
# Deploy to the target directory.
112-
- name: Deploy to gh pages
113-
uses: peaceiris/actions-gh-pages@373f7f263a76c20808c831209c920827a82a2847 # v3.9.3
114-
with:
115-
github_token: ${{ secrets.GITHUB_TOKEN }}
116-
publish_dir: ./dev-docs/_build/html
117-
destination_dir: ./dev-docs/${{ needs.pre.outputs.branch-version }}

.github/workflows/latest_deps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ jobs:
226226

227227
steps:
228228
- uses: actions/checkout@v4
229-
- uses: JasonEtco/create-an-issue@e27dddc79c92bc6e4562f268fffa5ed752639abd # v2.9.1
229+
- uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2
230230
env:
231231
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
232232
with:

.github/workflows/tests.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
integration: ${{ !startsWith(github.ref, 'refs/pull/') || steps.filter.outputs.integration }}
2323
linting: ${{ !startsWith(github.ref, 'refs/pull/') || steps.filter.outputs.linting }}
2424
steps:
25-
- uses: dorny/paths-filter@v2
25+
- uses: dorny/paths-filter@v3
2626
id: filter
2727
# We only check on PRs
2828
if: startsWith(github.ref, 'refs/pull/')
@@ -81,7 +81,7 @@ jobs:
8181
steps:
8282
- uses: actions/checkout@v4
8383
- name: Install Rust
84-
uses: dtolnay/rust-toolchain@1.65.0
84+
uses: dtolnay/rust-toolchain@1.66.0
8585
- uses: Swatinem/rust-cache@v2
8686
- uses: matrix-org/setup-python-poetry@v1
8787
with:
@@ -148,7 +148,7 @@ jobs:
148148
uses: actions/checkout@v4
149149

150150
- name: Install Rust
151-
uses: dtolnay/rust-toolchain@1.65.0
151+
uses: dtolnay/rust-toolchain@1.66.0
152152
- uses: Swatinem/rust-cache@v2
153153

154154
- name: Setup Poetry
@@ -208,7 +208,7 @@ jobs:
208208
with:
209209
ref: ${{ github.event.pull_request.head.sha }}
210210
- name: Install Rust
211-
uses: dtolnay/rust-toolchain@1.65.0
211+
uses: dtolnay/rust-toolchain@1.66.0
212212
- uses: Swatinem/rust-cache@v2
213213
- uses: matrix-org/setup-python-poetry@v1
214214
with:
@@ -225,7 +225,7 @@ jobs:
225225
- uses: actions/checkout@v4
226226

227227
- name: Install Rust
228-
uses: dtolnay/rust-toolchain@1.65.0
228+
uses: dtolnay/rust-toolchain@1.66.0
229229
with:
230230
components: clippy
231231
- uses: Swatinem/rust-cache@v2
@@ -344,7 +344,7 @@ jobs:
344344
postgres:${{ matrix.job.postgres-version }}
345345
346346
- name: Install Rust
347-
uses: dtolnay/rust-toolchain@1.65.0
347+
uses: dtolnay/rust-toolchain@1.66.0
348348
- uses: Swatinem/rust-cache@v2
349349

350350
- uses: matrix-org/setup-python-poetry@v1
@@ -386,7 +386,7 @@ jobs:
386386
- uses: actions/checkout@v4
387387

388388
- name: Install Rust
389-
uses: dtolnay/rust-toolchain@1.65.0
389+
uses: dtolnay/rust-toolchain@1.66.0
390390
- uses: Swatinem/rust-cache@v2
391391

392392
# There aren't wheels for some of the older deps, so we need to install
@@ -498,7 +498,7 @@ jobs:
498498
run: cat sytest-blacklist .ci/worker-blacklist > synapse-blacklist-with-workers
499499

500500
- name: Install Rust
501-
uses: dtolnay/rust-toolchain@1.65.0
501+
uses: dtolnay/rust-toolchain@1.66.0
502502
- uses: Swatinem/rust-cache@v2
503503

504504
- name: Run SyTest
@@ -642,7 +642,7 @@ jobs:
642642
path: synapse
643643

644644
- name: Install Rust
645-
uses: dtolnay/rust-toolchain@1.65.0
645+
uses: dtolnay/rust-toolchain@1.66.0
646646
- uses: Swatinem/rust-cache@v2
647647

648648
- name: Prepare Complement's Prerequisites
@@ -674,7 +674,7 @@ jobs:
674674
- uses: actions/checkout@v4
675675

676676
- name: Install Rust
677-
uses: dtolnay/rust-toolchain@1.65.0
677+
uses: dtolnay/rust-toolchain@1.66.0
678678
- uses: Swatinem/rust-cache@v2
679679

680680
- run: cargo test

.github/workflows/twisted_trunk.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ jobs:
207207

208208
steps:
209209
- uses: actions/checkout@v4
210-
- uses: JasonEtco/create-an-issue@e27dddc79c92bc6e4562f268fffa5ed752639abd # v2.9.1
210+
- uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2
211211
env:
212212
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
213213
with:

0 commit comments

Comments
 (0)