Skip to content

Commit 4631e14

Browse files
committed
Merge branch 'develop'
2 parents 3ba0d45 + 8dd9fb3 commit 4631e14

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

.github/workflows/upgrade-from-latest-release.yml

+2-9
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,5 @@ jobs:
107107
# For pull requests, ${GITHUB_SHA} is the automatically generated merge
108108
# commit that merges the PR's source branch to its destination branch.
109109
run: git checkout "${GITHUB_SHA}"
110-
111-
-
112-
name: Install all dependencies and symlink for ep_etherpad-lite
113-
run: bin/installDeps.sh
114-
-
115-
name: Run Etherpad & Test Frontend
116-
working-directory: ./src
117-
run: |
118-
pnpm run test-ui --project=chromium
110+
- name: Run the backend tests
111+
run: pnpm run test

CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# 2.0.1
2+
3+
### Notable enhancements and fixes
4+
5+
- Fixed a bug where a plugin depending on a scoped dependency would not install successfully.
6+
7+
18
# 2.0.0
29

310

admin/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "admin",
33
"private": true,
4-
"version": "2.0.0",
4+
"version": "2.0.1",
55
"type": "module",
66
"scripts": {
77
"dev": "vite",

bin/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bin",
3-
"version": "2.0.0",
3+
"version": "2.0.1",
44
"description": "",
55
"main": "checkAllPads.js",
66
"directories": {

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@
4141
"type": "git",
4242
"url": "https://github.com/ether/etherpad-lite.git"
4343
},
44-
"version": "2.0.0",
44+
"version": "2.0.1",
4545
"license": "Apache-2.0"
4646
}

src/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,6 @@
125125
"test-admin": "npx playwright test tests/frontend-new/admin-spec --workers 1",
126126
"test-admin:ui": "npx playwright test tests/frontend-new/admin-spec --ui --workers 1"
127127
},
128-
"version": "2.0.0",
128+
"version": "2.0.1",
129129
"license": "Apache-2.0"
130130
}

0 commit comments

Comments
 (0)