Skip to content

Commit d44d0bb

Browse files
Famedly release/v1.151 (#251)
# Famedly Synapse release v1.151.0_1 Docker image tags available: * `v1.151.0_1-mod026` <- TIM 1.1 * `v1.151.0_1-mod027` <- TIM Pro (and 1.2) ### Famedly additions for v1.151.0_1 * bump: Synapse Token Authenticator to `v0.13.1` in the Famedly docker image * bump: Synapse Invite Checker to `0.5.0` in the Famedly docker image
2 parents 0da1831 + 0ad7dee commit d44d0bb

84 files changed

Lines changed: 2638 additions & 1176 deletions

File tree

Some content is hidden

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

.ci/complement_package.gotpl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ which is under the Unlicense licence.
2929
{{- with .TestCases -}}
3030
{{- /* Passing tests are first */ -}}
3131
{{- range . -}}
32-
{{- if eq .Result "PASS" -}}
32+
{{- if and (eq .Result "PASS") (not $settings.HideSuccessfulTests) -}}
3333
::group::{{ "\033" }}[0;32m✅{{ " " }}{{- .Name -}}
3434
{{- "\033" -}}[0;37m ({{if $settings.ShowTestStatus}}{{.Result}}; {{end}}{{ .Duration -}}
3535
{{- with .Coverage -}}
@@ -49,7 +49,8 @@ which is under the Unlicense licence.
4949

5050
{{- /* Then skipped tests are second */ -}}
5151
{{- range . -}}
52-
{{- if eq .Result "SKIP" -}}
52+
{{- /* Skipped tests are also purposefully hidden if "HideSuccessfulTests" is enabled */ -}}
53+
{{- if and (eq .Result "SKIP") (not $settings.HideSuccessfulTests) -}}
5354
::group::{{ "\033" }}[0;33m🚧{{ " " }}{{- .Name -}}
5455
{{- "\033" -}}[0;37m ({{if $settings.ShowTestStatus}}{{.Result}}; {{end}}{{ .Duration -}}
5556
{{- with .Coverage -}}

.ci/scripts/calculate_builds.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,13 @@ def set_output(key: str, value: str) -> None:
7777
"sta-version": "0.13.0",
7878
"fcs-version": "0.0.2",
7979
},
80+
"mod026": {"sic-version": "0.2.2", "sta-version": "0.13.1", "fcs-version": "0.0.2"},
81+
"mod027": {"sic-version": "0.5.0", "sta-version": "0.13.1", "fcs-version": "0.0.2"},
8082
}
8183

8284
# Adjust this section to decide what gets built and layered on top
8385
# THIS IS THE SECTION TO EDIT, after you have added the new versions above
84-
current_mod_packs_to_build = ["mod024", "mod025"]
86+
current_mod_packs_to_build = ["mod026", "mod027"]
8587

8688
generated_jobs: list[dict[str, Any]] = []
8789
for mod_pack_job in current_mod_packs_to_build:

.ci/scripts/gotestfmt

Lines changed: 0 additions & 21 deletions
This file was deleted.

.ci/scripts/setup_complement_prerequisites.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ alias block='{ set +x; } 2>/dev/null; func() { echo "::group::$*"; set -x; }; fu
1010
alias endblock='{ set +x; } 2>/dev/null; func() { echo "::endgroup::"; set -x; }; func'
1111

1212
block Install Complement Dependencies
13-
sudo apt-get -qq update && sudo apt-get install -qqy libolm3 libolm-dev
1413
go install -v github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt@latest
1514
endblock
1615

.github/workflows/docker.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
steps:
2929
- name: Set up Docker Buildx
3030
id: buildx
31-
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
31+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
3232

3333
- name: Checkout repository
3434
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -41,20 +41,20 @@ jobs:
4141
echo "SYNAPSE_VERSION=$(grep "^version" pyproject.toml | sed -E 's/version\s*=\s*["]([^"]*)["]/\1/')" >> $GITHUB_ENV
4242
4343
- name: Log in to DockerHub
44-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
44+
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
4545
with:
4646
username: ${{ secrets.DOCKERHUB_USERNAME }}
4747
password: ${{ secrets.DOCKERHUB_TOKEN }}
4848

4949
- name: Log in to GHCR
50-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
50+
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
5151
with:
5252
registry: ghcr.io
5353
username: ${{ github.repository_owner }}
5454
password: ${{ secrets.GITHUB_TOKEN }}
5555

5656
- name: Tailscale
57-
uses: tailscale/github-action@53acf823325fe9ca47f4cdaa951f90b4b0de5bb9 # v4.1.1
57+
uses: tailscale/github-action@306e68a486fd2350f2bfc3b19fcd143891a4a2d8 # v4.1.2
5858
with:
5959
oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }}
6060
audience: ${{ secrets.TS_AUDIENCE }}
@@ -79,15 +79,15 @@ jobs:
7979
services/backend-repositories/secret/data/oci.element.io password | OCI_PASSWORD ;
8080
8181
- name: Login to Element OCI Registry
82-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
82+
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
8383
with:
8484
registry: oci-push.vpn.infra.element.io
8585
username: ${{ steps.import-secrets.outputs.OCI_USERNAME }}
8686
password: ${{ steps.import-secrets.outputs.OCI_PASSWORD }}
8787

8888
- name: Build and push by digest
8989
id: build
90-
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
90+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
9191
with:
9292
push: true
9393
labels: |
@@ -108,7 +108,7 @@ jobs:
108108
touch "${{ runner.temp }}/digests/${digest#sha256:}"
109109
110110
- name: Upload digest
111-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
111+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
112112
with:
113113
name: digests-${{ matrix.suffix }}
114114
path: ${{ runner.temp }}/digests/*
@@ -129,29 +129,29 @@ jobs:
129129
- build
130130
steps:
131131
- name: Download digests
132-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
132+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
133133
with:
134134
path: ${{ runner.temp }}/digests
135135
pattern: digests-*
136136
merge-multiple: true
137137

138138
- name: Log in to DockerHub
139-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
139+
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
140140
if: ${{ startsWith(matrix.repository, 'docker.io') }}
141141
with:
142142
username: ${{ secrets.DOCKERHUB_USERNAME }}
143143
password: ${{ secrets.DOCKERHUB_TOKEN }}
144144

145145
- name: Log in to GHCR
146-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
146+
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
147147
if: ${{ startsWith(matrix.repository, 'ghcr.io') }}
148148
with:
149149
registry: ghcr.io
150150
username: ${{ github.repository_owner }}
151151
password: ${{ secrets.GITHUB_TOKEN }}
152152

153153
- name: Tailscale
154-
uses: tailscale/github-action@53acf823325fe9ca47f4cdaa951f90b4b0de5bb9 # v4.1.1
154+
uses: tailscale/github-action@306e68a486fd2350f2bfc3b19fcd143891a4a2d8 # v4.1.2
155155
with:
156156
oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }}
157157
audience: ${{ secrets.TS_AUDIENCE }}
@@ -176,20 +176,20 @@ jobs:
176176
services/backend-repositories/secret/data/oci.element.io password | OCI_PASSWORD ;
177177
178178
- name: Login to Element OCI Registry
179-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
179+
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
180180
with:
181181
registry: oci-push.vpn.infra.element.io
182182
username: ${{ steps.import-secrets.outputs.OCI_USERNAME }}
183183
password: ${{ steps.import-secrets.outputs.OCI_PASSWORD }}
184184

185185
- name: Set up Docker Buildx
186-
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
186+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
187187

188188
- name: Install Cosign
189189
uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad # v4.0.0
190190

191191
- name: Calculate docker image tag
192-
uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
192+
uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
193193
with:
194194
images: ${{ matrix.repository }}
195195
flavor: |

.github/workflows/docs-pr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
cp book/welcome_and_overview.html book/index.html
4646
4747
- name: Upload Artifact
48-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
48+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
4949
with:
5050
name: book
5151
path: book

.github/workflows/famedly-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ jobs:
507507
508508
- name: Run token-authenticator tests
509509
working-directory: synapse-token-authenticator
510-
run: hatch run pip install -r synapse-requirements.txt && hatch run cov
510+
run: hatch run pip install -r synapse-requirements.txt && hatch test -p -c
511511

512512
- name: Display Hatch Environment Info
513513
if: always()

.github/workflows/fix_lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
with:
2626
toolchain: ${{ env.RUST_VERSION }}
2727
components: clippy, rustfmt
28-
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
28+
- uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
2929

3030
- name: Setup Poetry
3131
uses: matrix-org/setup-python-poetry@5bbf6603c5c930615ec8a29f1b5d7d258d905aa4 # v2.0.0

.github/workflows/latest_deps.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
4848
with:
4949
toolchain: ${{ env.RUST_VERSION }}
50-
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
50+
- uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
5151

5252
# The dev dependencies aren't exposed in the wheel metadata (at least with current
5353
# poetry-core versions), so we install with poetry.
@@ -83,7 +83,7 @@ jobs:
8383
uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
8484
with:
8585
toolchain: ${{ env.RUST_VERSION }}
86-
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
86+
- uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
8787

8888
- run: sudo apt-get -qq install xmlsec1
8989
- name: Set up PostgreSQL ${{ matrix.postgres-version }}
@@ -157,7 +157,7 @@ jobs:
157157
uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
158158
with:
159159
toolchain: ${{ env.RUST_VERSION }}
160-
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
160+
- uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
161161

162162
- name: Ensure sytest runs `pip install`
163163
# Delete the lockfile so sytest will `pip install` rather than `poetry install`
@@ -172,7 +172,7 @@ jobs:
172172
if: ${{ always() }}
173173
run: /sytest/scripts/tap_to_gha.pl /logs/results.tap
174174
- name: Upload SyTest logs
175-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
175+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
176176
if: ${{ always() }}
177177
with:
178178
name: Sytest Logs - ${{ job.status }} - (${{ join(matrix.*, ', ') }})
@@ -207,7 +207,7 @@ jobs:
207207
- name: Prepare Complement's Prerequisites
208208
run: synapse/.ci/scripts/setup_complement_prerequisites.sh
209209

210-
- uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
210+
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
211211
with:
212212
cache-dependency-path: complement/go.sum
213213
go-version-file: complement/go.mod

.github/workflows/push_complement_image.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,19 @@ jobs:
4747
if: github.event_name == 'push'
4848
with:
4949
ref: master
50+
# We use `poetry` in `complement.sh`
51+
- uses: matrix-org/setup-python-poetry@5bbf6603c5c930615ec8a29f1b5d7d258d905aa4 # v2.0.0
52+
with:
53+
poetry-version: "2.2.1"
5054
- name: Login to registry
51-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
55+
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
5256
with:
5357
registry: ghcr.io
5458
username: ${{ github.actor }}
5559
password: ${{ secrets.GITHUB_TOKEN }}
5660
- name: Work out labels for complement image
5761
id: meta
58-
uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
62+
uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
5963
with:
6064
images: ghcr.io/${{ github.repository }}/complement-synapse
6165
tags: |

0 commit comments

Comments
 (0)