Skip to content

Commit 769f028

Browse files
author
Etherpad Release Bot
committed
Merge branch 'develop'
2 parents a90e0f1 + 95096d5 commit 769f028

93 files changed

Lines changed: 4595 additions & 2182 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.

‎.github/dependabot.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,21 @@ updates:
1818
groups:
1919
dev-dependencies:
2020
dependency-type: "development"
21+
ignore:
22+
# openapi-typescript's peer range is typescript@^5.x and it builds its
23+
# output with the TypeScript *compiler API*, which TypeScript 7 (the
24+
# native port) no longer exposes. admin/tools/openapi-codegen pins it to
25+
# 6.x on purpose (see its README); a semver-major bump there re-breaks
26+
# `gen:api`. Review TS major bumps manually instead.
27+
- dependency-name: "typescript"
28+
update-types: ["version-update:semver-major"]
29+
# mocha 12.0.1 require()s the ESM-only find-up@8; under `--import=tsx`
30+
# tsx resolves its nested `unicorn-magic` import with require conditions
31+
# and mocha dies at startup (ERR_PACKAGE_PATH_NOT_EXPORTED), so no
32+
# backend test runs. src/package.json pins 12.0.0; lift once tsx or
33+
# mocha fixes it.
34+
- dependency-name: "mocha"
35+
versions: ["12.0.1"]
2136
cooldown:
2237
default-days: 1 # fallback for anything not covered below
2338
semver-major-days: 7

‎.github/workflows/backend-tests.yml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
name: "Backend tests"
22

33
# any branch is useful for testing before a PR is submitted
4+
# No paths-ignore: the Linux jobs are required status checks on develop (so
5+
# Dependabot auto-merge waits for them). A skipped workflow never reports, which
6+
# would leave docs-only PRs blocked forever.
47
on:
58
push:
6-
paths-ignore:
7-
- "doc/**"
89
pull_request:
9-
paths-ignore:
10-
- "doc/**"
1110

1211
permissions:
1312
contents: read
@@ -40,7 +39,7 @@ jobs:
4039
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
4140
restore-keys: |
4241
${{ runner.os }}-pnpm-store-
43-
- uses: pnpm/action-setup@v6
42+
- uses: pnpm/action-setup@v6.1.0
4443
name: Install pnpm
4544
with:
4645
run_install: false
@@ -96,7 +95,7 @@ jobs:
9695
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
9796
restore-keys: |
9897
${{ runner.os }}-pnpm-store-
99-
- uses: pnpm/action-setup@v6
98+
- uses: pnpm/action-setup@v6.1.0
10099
name: Install pnpm
101100
with:
102101
run_install: false
@@ -176,7 +175,7 @@ jobs:
176175
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
177176
restore-keys: |
178177
${{ runner.os }}-pnpm-store-
179-
- uses: pnpm/action-setup@v6
178+
- uses: pnpm/action-setup@v6.1.0
180179
name: Install pnpm
181180
with:
182181
run_install: false
@@ -242,7 +241,7 @@ jobs:
242241
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
243242
restore-keys: |
244243
${{ runner.os }}-pnpm-store-
245-
- uses: pnpm/action-setup@v6
244+
- uses: pnpm/action-setup@v6.1.0
246245
name: Install pnpm
247246
with:
248247
run_install: false

‎.github/workflows/build-and-deploy-docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
key: ${{ runner.os }}-vitepress-${{ hashFiles('doc/**/*.md', 'doc/.vitepress/config.*') }}
5252
restore-keys: |
5353
${{ runner.os }}-vitepress-
54-
- uses: pnpm/action-setup@v6
54+
- uses: pnpm/action-setup@v6.1.0
5555
name: Install pnpm
5656
with:
5757
run_install: false

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ jobs:
3737
if: ${{ github.event_name == 'pull_request' }}
3838
-
3939
name: Initialize CodeQL
40-
uses: github/codeql-action/init@v4
40+
uses: github/codeql-action/init@v4.38.0
4141
-
4242
name: Autobuild
43-
uses: github/codeql-action/autobuild@v4
43+
uses: github/codeql-action/autobuild@v4.38.0
4444
-
4545
name: Perform CodeQL Analysis
46-
uses: github/codeql-action/analyze@v4
46+
uses: github/codeql-action/analyze@v4.38.0

‎.github/workflows/deb-package.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
with:
6767
ref: ${{ inputs.ref || github.ref }}
6868

69-
- uses: pnpm/action-setup@v6
69+
- uses: pnpm/action-setup@v6.1.0
7070

7171
- name: Setup Node
7272
uses: actions/setup-node@v7

‎.github/workflows/dependabot-automerge.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: "Dependabot auto-merge"
2+
3+
on: pull_request
4+
5+
permissions:
6+
contents: write
7+
pull-requests: write
8+
9+
jobs:
10+
dependabot:
11+
runs-on: ubuntu-latest
12+
if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}
13+
steps:
14+
- name: Dependabot metadata
15+
id: metadata
16+
uses: dependabot/fetch-metadata@v3
17+
with:
18+
github-token: "${{ secrets.GITHUB_TOKEN }}"
19+
20+
# Optional: to auto-merge only patch and minor bumps and leave major
21+
# upgrades for manual review, gate this step on:
22+
#
23+
# if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-patch' ||
24+
# steps.metadata.outputs.update-type == 'version-update:semver-minor' }}
25+
- name: Enable auto-merge for Dependabot PRs
26+
# --squash matches this repo's squash-merge convention. Swap for
27+
# --merge or --rebase if you prefer a different merge method.
28+
run: gh pr merge --auto --squash "$PR_URL"
29+
env:
30+
PR_URL: ${{ github.event.pull_request.html_url }}
31+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/docker.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
5050
restore-keys: |
5151
${{ runner.os }}-pnpm-store-
52-
- uses: pnpm/action-setup@v6
52+
- uses: pnpm/action-setup@v6.1.0
5353
name: Install pnpm
5454
with:
5555
run_install: false
@@ -382,13 +382,13 @@ jobs:
382382
type=semver,pattern={{major}}
383383
-
384384
name: Log in to Docker Hub
385-
uses: docker/login-action@v4
385+
uses: docker/login-action@v4.6.0
386386
with:
387387
username: ${{ secrets.DOCKERHUB_USERNAME }}
388388
password: ${{ secrets.DOCKERHUB_TOKEN }}
389389
-
390390
name: Log in to GHCR
391-
uses: docker/login-action@v4
391+
uses: docker/login-action@v4.6.0
392392
with:
393393
registry: ghcr.io
394394
username: ${{ github.actor }}

‎.github/workflows/downstream-smoke.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
restore-keys: |
3737
${{ runner.os }}-pnpm-store-
3838
39-
- uses: pnpm/action-setup@v6
39+
- uses: pnpm/action-setup@v6.1.0
4040
name: Install pnpm
4141
with:
4242
run_install: false

‎.github/workflows/frontend-admin-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
3636
restore-keys: |
3737
${{ runner.os }}-pnpm-store-
38-
- uses: pnpm/action-setup@v6
38+
- uses: pnpm/action-setup@v6.1.0
3939
name: Install pnpm
4040
with:
4141
run_install: false

‎.github/workflows/frontend-tests.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
key: ${{ runner.os }}-playwright-${{ hashFiles('src/package.json', 'pnpm-lock.yaml') }}
3636
restore-keys: |
3737
${{ runner.os }}-playwright-
38-
- uses: pnpm/action-setup@v6
38+
- uses: pnpm/action-setup@v6.1.0
3939
name: Install pnpm
4040
with:
4141
run_install: false
@@ -107,7 +107,7 @@ jobs:
107107
key: ${{ runner.os }}-playwright-${{ hashFiles('src/package.json', 'pnpm-lock.yaml') }}
108108
restore-keys: |
109109
${{ runner.os }}-playwright-
110-
- uses: pnpm/action-setup@v6
110+
- uses: pnpm/action-setup@v6.1.0
111111
name: Install pnpm
112112
with:
113113
run_install: false
@@ -183,7 +183,7 @@ jobs:
183183
key: ${{ runner.os }}-playwright-${{ hashFiles('src/package.json', 'pnpm-lock.yaml') }}
184184
restore-keys: |
185185
${{ runner.os }}-playwright-
186-
- uses: pnpm/action-setup@v6
186+
- uses: pnpm/action-setup@v6.1.0
187187
name: Install pnpm
188188
with:
189189
run_install: false
@@ -284,7 +284,7 @@ jobs:
284284
key: ${{ runner.os }}-playwright-${{ hashFiles('src/package.json', 'pnpm-lock.yaml') }}
285285
restore-keys: |
286286
${{ runner.os }}-playwright-
287-
- uses: pnpm/action-setup@v6
287+
- uses: pnpm/action-setup@v6.1.0
288288
name: Install pnpm
289289
with:
290290
run_install: false

0 commit comments

Comments
 (0)