Skip to content

Commit 3c90fa0

Browse files
author
Etherpad Release Bot
committed
Merge branch 'develop'
2 parents 92e23bf + 93e5bcc commit 3c90fa0

67 files changed

Lines changed: 2361 additions & 1160 deletions

Some content is hidden

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

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
steps:
3333
-
3434
name: Checkout repository
35-
uses: actions/checkout@v6
35+
uses: actions/checkout@v7
3636
- uses: actions/cache@v5
3737
name: Cache pnpm store
3838
with:
@@ -51,7 +51,7 @@ jobs:
5151
cache: pnpm
5252
-
5353
name: Install libreoffice
54-
uses: awalsh128/cache-apt-pkgs-action@v1.6.0
54+
uses: awalsh128/cache-apt-pkgs-action@v1.6.1
5555
with:
5656
packages: libreoffice libreoffice-pdfimport
5757
version: 1.0
@@ -88,7 +88,7 @@ jobs:
8888
steps:
8989
-
9090
name: Checkout repository
91-
uses: actions/checkout@v6
91+
uses: actions/checkout@v7
9292
- uses: actions/cache@v5
9393
name: Cache pnpm store
9494
with:
@@ -107,7 +107,7 @@ jobs:
107107
cache: pnpm
108108
-
109109
name: Install libreoffice
110-
uses: awalsh128/cache-apt-pkgs-action@v1.6.0
110+
uses: awalsh128/cache-apt-pkgs-action@v1.6.1
111111
with:
112112
packages: libreoffice libreoffice-pdfimport
113113
version: 1.0
@@ -168,7 +168,7 @@ jobs:
168168
steps:
169169
-
170170
name: Checkout repository
171-
uses: actions/checkout@v6
171+
uses: actions/checkout@v7
172172
- uses: actions/cache@v5
173173
name: Cache pnpm store
174174
with:
@@ -234,7 +234,7 @@ jobs:
234234
steps:
235235
-
236236
name: Checkout repository
237-
uses: actions/checkout@v6
237+
uses: actions/checkout@v7
238238
- uses: actions/cache@v5
239239
name: Cache pnpm store
240240
with:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
runs-on: ubuntu-latest
3737
steps:
3838
- name: Checkout
39-
uses: actions/checkout@v6
39+
uses: actions/checkout@v7
4040
- uses: actions/cache@v5
4141
name: Cache pnpm store
4242
with:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
steps:
2626
-
2727
name: Checkout repository
28-
uses: actions/checkout@v6
28+
uses: actions/checkout@v7
2929
with:
3030
# We must fetch at least the immediate parents so that if this is
3131
# a pull request then we can checkout the head.

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

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,24 @@ on:
1515
- 'src/node/utils/run_cmd.ts'
1616
- 'src/static/js/pluginfw/**'
1717
- 'settings.json.template'
18+
# Also build + smoke-test the package on PRs that touch the production
19+
# footprint. The smoke step boots the packaged server and waits for /health,
20+
# which is the only check that catches "server starts then exits before
21+
# binding the port" startup regressions (e.g. a dependency bump whose change
22+
# lets the event loop drain mid-boot). Previously this workflow ran only on
23+
# push to develop, so such a regression was caught *after* merge — by which
24+
# point develop was already red. Running it pre-merge blocks the PR instead.
25+
# The release/apt-publish jobs are tag-guarded, so PRs run the build job only.
26+
pull_request:
27+
paths:
28+
- 'packaging/**'
29+
- '.github/workflows/deb-package.yml'
30+
- 'src/package.json'
31+
- 'pnpm-lock.yaml'
32+
- 'src/node/server.ts'
33+
- 'src/node/utils/run_cmd.ts'
34+
- 'src/static/js/pluginfw/**'
35+
- 'settings.json.template'
1836
workflow_dispatch:
1937
inputs:
2038
ref:
@@ -44,7 +62,7 @@ jobs:
4462
runner: ubuntu-24.04-arm
4563
steps:
4664
- name: Checkout
47-
uses: actions/checkout@v6
65+
uses: actions/checkout@v7
4866
with:
4967
ref: ${{ inputs.ref || github.ref }}
5068

@@ -328,7 +346,7 @@ jobs:
328346
runs-on: ubuntu-latest
329347
steps:
330348
- name: Checkout etherpad source (for packaging/apt/key.asc)
331-
uses: actions/checkout@v6
349+
uses: actions/checkout@v7
332350
with:
333351
fetch-depth: 1
334352

‎.github/workflows/dependency-review.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: 'Checkout Repository'
18-
uses: actions/checkout@v6
18+
uses: actions/checkout@v7
1919
- name: 'Dependency Review'
2020
uses: actions/dependency-review-action@v5

‎.github/workflows/docker.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
steps:
2727
-
2828
name: Check out
29-
uses: actions/checkout@v6
29+
uses: actions/checkout@v7
3030
with:
3131
path: etherpad
3232
-
@@ -190,7 +190,7 @@ jobs:
190190
steps:
191191
-
192192
name: Check out
193-
uses: actions/checkout@v6
193+
uses: actions/checkout@v7
194194
with:
195195
path: etherpad
196196
-
@@ -261,7 +261,7 @@ jobs:
261261
steps:
262262
-
263263
name: Check out
264-
uses: actions/checkout@v6
264+
uses: actions/checkout@v7
265265
with:
266266
path: etherpad
267267
-
@@ -358,7 +358,7 @@ jobs:
358358
steps:
359359
-
360360
name: Check out
361-
uses: actions/checkout@v6
361+
uses: actions/checkout@v7
362362
with:
363363
path: etherpad
364364
-
@@ -416,7 +416,7 @@ jobs:
416416
enable-url-completion: true
417417
- name: Check out ether-charts
418418
if: github.ref == 'refs/heads/develop'
419-
uses: actions/checkout@v6
419+
uses: actions/checkout@v7
420420
with:
421421
path: ether-charts
422422
repository: ether/ether-charts

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
APIKEY: downstream-smoke-key
2727
steps:
2828
- name: Checkout core (PR)
29-
uses: actions/checkout@v6
29+
uses: actions/checkout@v7
3030

3131
- uses: actions/cache@v5
3232
name: Cache pnpm store

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
steps:
2828
-
2929
name: Checkout repository
30-
uses: actions/checkout@v6
30+
uses: actions/checkout@v7
3131
- uses: actions/cache@v5
3232
name: Cache pnpm store
3333
with:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
steps:
2121
-
2222
name: Checkout repository
23-
uses: actions/checkout@v6
23+
uses: actions/checkout@v7
2424
- uses: actions/cache@v5
2525
name: Cache pnpm store
2626
with:
@@ -92,7 +92,7 @@ jobs:
9292
runs-on: ubuntu-latest
9393
steps:
9494
- name: Checkout repository
95-
uses: actions/checkout@v6
95+
uses: actions/checkout@v7
9696
- uses: actions/cache@v5
9797
name: Cache pnpm store
9898
with:
@@ -168,7 +168,7 @@ jobs:
168168
runs-on: ubuntu-latest
169169
steps:
170170
- name: Checkout repository
171-
uses: actions/checkout@v6
171+
uses: actions/checkout@v7
172172
- uses: actions/cache@v5
173173
name: Cache pnpm store
174174
with:
@@ -269,7 +269,7 @@ jobs:
269269
runs-on: ubuntu-latest
270270
steps:
271271
- name: Checkout repository
272-
uses: actions/checkout@v6
272+
uses: actions/checkout@v7
273273
- uses: actions/cache@v5
274274
name: Cache pnpm store
275275
with:

‎.github/workflows/handleRelease.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
steps:
2828
-
2929
name: Checkout repository
30-
uses: actions/checkout@v6
30+
uses: actions/checkout@v7
3131
- uses: actions/cache@v5
3232
name: Cache pnpm store
3333
with:

0 commit comments

Comments
 (0)