Skip to content

Commit a0141ab

Browse files
JohnMcLearclaude
andcommitted
Merge develop into feature/7524-drop-swagger-ui-telemetry
Conflicts: - src/static/js/pluginfw/installer.ts: keep both sides (assertPluginCatalogEnabled from PR + checkEngineCompatibility/InstallerTaskQueue from develop) - pnpm-lock.yaml: regenerated via pnpm install --lockfile-only Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2 parents 14a0350 + 8c4f974 commit a0141ab

64 files changed

Lines changed: 1563 additions & 412 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: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ jobs:
2727
strategy:
2828
fail-fast: false
2929
matrix:
30-
# Etherpad requires Node >= 25 (see package.json engines.node).
31-
node: ${{ fromJSON('[25]') }}
30+
# Etherpad requires Node >= 24 (see package.json engines.node).
31+
node: ${{ fromJSON('[24]') }}
3232
steps:
3333
-
3434
name: Checkout repository
@@ -101,7 +101,7 @@ jobs:
101101
strategy:
102102
fail-fast: false
103103
matrix:
104-
node: ${{ fromJSON('[25]') }}
104+
node: ${{ fromJSON('[24]') }}
105105
steps:
106106
-
107107
name: Checkout repository
@@ -179,8 +179,8 @@ jobs:
179179
strategy:
180180
fail-fast: false
181181
matrix:
182-
# Etherpad requires Node >= 25 (see package.json engines.node).
183-
node: ${{ fromJSON('[25]') }}
182+
# Etherpad requires Node >= 24 (see package.json engines.node).
183+
node: ${{ fromJSON('[24]') }}
184184
name: Windows without plugins
185185
runs-on: windows-latest
186186
steps:
@@ -247,8 +247,8 @@ jobs:
247247
strategy:
248248
fail-fast: false
249249
matrix:
250-
# Etherpad requires Node >= 25 (see package.json engines.node).
251-
node: ${{ fromJSON('[25]') }}
250+
# Etherpad requires Node >= 24 (see package.json engines.node).
251+
node: ${{ fromJSON('[24]') }}
252252
name: Windows with Plugins
253253
runs-on: windows-latest
254254

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ jobs:
5656
with:
5757
run_install: false
5858
# Pin Node so the build does not silently fall back to whatever the
59-
# runner image ships with. The repo declares engines.node >=25.0.0.
59+
# runner image ships with. The repo declares engines.node >=24.0.0.
6060
- name: Use Node.js
6161
uses: actions/setup-node@v6
6262
with:
63-
node-version: 25
63+
node-version: 24
6464
cache: pnpm
6565
- name: Setup Pages
6666
if: github.event_name == 'push'

.github/workflows/deb-package.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- name: Setup Node
5454
uses: actions/setup-node@v6
5555
with:
56-
node-version: '25'
56+
node-version: '24'
5757
cache: pnpm
5858

5959
- name: Resolve version
@@ -128,16 +128,16 @@ jobs:
128128
run: |
129129
set -eux
130130
# Ubuntu's default apt nodejs is 18 — too old for our
131-
# `Depends: nodejs (>= 25)`. Add NodeSource's apt repo
131+
# `Depends: nodejs (>= 24)`. Add NodeSource's apt repo
132132
# explicitly (key + sources.list) instead of `curl | sudo bash`
133133
# so we don't execute network-fetched code as root.
134-
NODE_MAJOR=25
134+
NODE_MAJOR=24
135135
# GitHub runner images often ship a NodeSource node_20.x list
136136
# preinstalled (sometimes as a .sources deb822 file). Wipe any
137137
# existing nodesource entries so the only Node candidate apt sees
138-
# is our node_25.x repo. Otherwise `apt-get install -y nodejs`
138+
# is our node_24.x repo. Otherwise `apt-get install -y nodejs`
139139
# picks the higher-version 20.x build that's already cached and
140-
# `dpkg -i` then fails on `Depends: nodejs (>= 25)`.
140+
# `dpkg -i` then fails on `Depends: nodejs (>= 24)`.
141141
sudo rm -f /etc/apt/sources.list.d/nodesource.list \
142142
/etc/apt/sources.list.d/nodesource.sources \
143143
/etc/apt/preferences.d/nodesource \
@@ -147,7 +147,7 @@ jobs:
147147
| sudo gpg --dearmor --yes -o "${KEYRING}"
148148
echo "deb [signed-by=${KEYRING}] https://deb.nodesource.com/node_${NODE_MAJOR}.x nodistro main" \
149149
| sudo tee /etc/apt/sources.list.d/nodesource.list
150-
# Pin nodejs to the 25.x line so neither Ubuntu's noble-updates
150+
# Pin nodejs to the 24.x line so neither Ubuntu's noble-updates
151151
# 20.x nor any leftover NodeSource cache can win the resolver.
152152
printf 'Package: nodejs\nPin: version %s.*\nPin-Priority: 1001\n' "${NODE_MAJOR}" \
153153
| sudo tee /etc/apt/preferences.d/nodesource >/dev/null

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- name: Use Node.js
6060
uses: actions/setup-node@v6
6161
with:
62-
node-version: 25
62+
node-version: 24
6363
cache: pnpm
6464
cache-dependency-path: etherpad/pnpm-lock.yaml
6565
-

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
# Etherpad requires Node >= 25 (see package.json engines.node).
25-
node: ${{ fromJSON('[25]') }}
24+
# Etherpad requires Node >= 24 (see package.json engines.node).
25+
node: ${{ fromJSON('[24]') }}
2626

2727
steps:
2828
-

.github/workflows/frontend-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- name: Use Node.js
4343
uses: actions/setup-node@v6
4444
with:
45-
node-version: 25
45+
node-version: 24
4646
cache: pnpm
4747
-
4848
name: Install all dependencies and symlink for ep_etherpad-lite
@@ -114,7 +114,7 @@ jobs:
114114
- name: Use Node.js
115115
uses: actions/setup-node@v6
116116
with:
117-
node-version: 25
117+
node-version: 24
118118
cache: pnpm
119119
- name: Install all dependencies and symlink for ep_etherpad-lite
120120
run: pnpm install --frozen-lockfile
@@ -190,7 +190,7 @@ jobs:
190190
- name: Use Node.js
191191
uses: actions/setup-node@v6
192192
with:
193-
node-version: 25
193+
node-version: 24
194194
cache: pnpm
195195
- name: Install all dependencies and symlink for ep_etherpad-lite
196196
run: pnpm install --frozen-lockfile
@@ -291,7 +291,7 @@ jobs:
291291
- name: Use Node.js
292292
uses: actions/setup-node@v6
293293
with:
294-
node-version: 25
294+
node-version: 24
295295
cache: pnpm
296296
- name: Install all dependencies and symlink for ep_etherpad-lite
297297
run: pnpm install --frozen-lockfile

.github/workflows/handleRelease.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- name: Use Node.js
4343
uses: actions/setup-node@v6
4444
with:
45-
node-version: 25
45+
node-version: 24
4646
cache: pnpm
4747
- name: Install all dependencies and symlink for ep_etherpad-lite
4848
run: pnpm install --frozen-lockfile

.github/workflows/installer-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
- uses: actions/setup-node@v6
4444
with:
45-
node-version: 25
45+
node-version: 24
4646

4747
- name: Pre-install pnpm (avoid sudo prompt in the installer)
4848
run: npm install -g pnpm
@@ -104,7 +104,7 @@ jobs:
104104

105105
- uses: actions/setup-node@v6
106106
with:
107-
node-version: 25
107+
node-version: 24
108108

109109
- name: Pre-install pnpm
110110
run: npm install -g pnpm

.github/workflows/load-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Use Node.js
4040
uses: actions/setup-node@v6
4141
with:
42-
node-version: 25
42+
node-version: 24
4343
cache: pnpm
4444
-
4545
name: Install all dependencies and symlink for ep_etherpad-lite
@@ -77,7 +77,7 @@ jobs:
7777
- name: Use Node.js
7878
uses: actions/setup-node@v6
7979
with:
80-
node-version: 25
80+
node-version: 24
8181
cache: pnpm
8282
-
8383
name: Install etherpad-load-test
@@ -140,7 +140,7 @@ jobs:
140140
- name: Use Node.js
141141
uses: actions/setup-node@v6
142142
with:
143-
node-version: 25
143+
node-version: 24
144144
cache: pnpm
145145
-
146146
name: Install all dependencies and symlink for ep_etherpad-lite

.github/workflows/perform-type-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Use Node.js
4040
uses: actions/setup-node@v6
4141
with:
42-
node-version: 25
42+
node-version: 24
4343
cache: pnpm
4444
- name: Install all dependencies and symlink for ep_etherpad-lite
4545
run: pnpm install --frozen-lockfile

0 commit comments

Comments
 (0)