Skip to content

Commit db13fbf

Browse files
committed
autofixes from Etherpad checkPlugin.js
1 parent 14ec1f4 commit db13fbf

5 files changed

Lines changed: 2149 additions & 1345 deletions

File tree

.github/workflows/backend-tests.yml

Lines changed: 9 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ jobs:
1616
steps:
1717
-
1818
name: Install libreoffice
19-
uses: awalsh128/cache-apt-pkgs-action@v1.4.2
19+
uses: awalsh128/cache-apt-pkgs-action@v1.6.0
2020
with:
2121
packages: libreoffice libreoffice-pdfimport
2222
version: 1.0
2323
-
2424
name: Install etherpad core
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v4
2626
with:
2727
repository: ether/etherpad-lite
2828
path: etherpad-lite
2929
- uses: pnpm/action-setup@v3
3030
name: Install pnpm
3131
with:
32-
version: 8
32+
version: 10
3333
run_install: false
3434
- name: Get pnpm store directory
3535
shell: bash
@@ -44,49 +44,27 @@ jobs:
4444
${{ runner.os }}-pnpm-store-
4545
-
4646
name: Checkout plugin repository
47-
uses: actions/checkout@v3
47+
uses: actions/checkout@v4
4848
with:
4949
path: plugin
50-
-
51-
name: Determine plugin name
52-
id: plugin_name
53-
working-directory: ./plugin
54-
run: |
55-
npx -c 'printf %s\\n "::set-output name=plugin_name::${npm_package_name}"'
56-
-
57-
name: Link plugin directory
58-
working-directory: ./plugin
59-
run: |
60-
pnpm link --global
6150
- name: Remove tests
6251
working-directory: ./etherpad-lite
6352
run: rm -rf ./src/tests/backend/specs
6453
-
6554
name: Install Etherpad core dependencies
6655
working-directory: ./etherpad-lite
6756
run: bin/installDeps.sh
68-
- name: Link plugin to etherpad-lite
57+
- name: Install plugin
6958
working-directory: ./etherpad-lite
7059
run: |
71-
pnpm link --global $PLUGIN_NAME
72-
pnpm run install-plugins --path ../../plugin
73-
env:
74-
PLUGIN_NAME: ${{ steps.plugin_name.outputs.plugin_name }}
75-
- name: Link ep_etherpad-lite
76-
working-directory: ./etherpad-lite/src
77-
run: |
78-
pnpm link --global
79-
- name: Link etherpad to plugin
80-
working-directory: ./plugin
81-
run: |
82-
pnpm link --global ep_etherpad-lite
60+
pnpm run plugins i --path ../../plugin
8361
-
8462
name: Run the backend tests
85-
working-directory: ./etherpad-lite
63+
working-directory: ./etherpad-lite/src
8664
run: |
87-
res=$(find .. -path "./node_modules/ep_*/static/tests/backend/specs/**" | wc -l)
65+
res=$(find ./plugin_packages -path "*/static/tests/backend/specs/*" 2>/dev/null | wc -l)
8866
if [ $res -eq 0 ]; then
8967
echo "No backend tests found"
9068
else
91-
pnpm run test
69+
npx cross-env NODE_ENV=production mocha --import=tsx --timeout 120000 --recursive node_modules/ep_*/static/tests/backend/specs/**
9270
fi

.github/workflows/frontend-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
steps:
1313
-
1414
name: Check out Etherpad core
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616
with:
1717
repository: ether/etherpad-lite
1818
- uses: pnpm/action-setup@v3
1919
name: Install pnpm
2020
with:
21-
version: 8
21+
version: 10
2222
run_install: false
2323
- name: Get pnpm store directory
2424
shell: bash
@@ -33,7 +33,7 @@ jobs:
3333
${{ runner.os }}-pnpm-store-
3434
-
3535
name: Check out the plugin
36-
uses: actions/checkout@v3
36+
uses: actions/checkout@v4
3737
with:
3838
path: ./node_modules/__tmp
3939
-

.github/workflows/npmpublish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ jobs:
1515
node-version: 20
1616
registry-url: https://registry.npmjs.org/
1717
- name: Check out Etherpad core
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919
with:
2020
repository: ether/etherpad-lite
2121
- uses: pnpm/action-setup@v3
2222
name: Install pnpm
2323
with:
24-
version: 8
24+
version: 10
2525
run_install: false
2626
- name: Get pnpm store directory
2727
shell: bash
@@ -35,7 +35,7 @@ jobs:
3535
restore-keys: |
3636
${{ runner.os }}-pnpm-store-
3737
-
38-
uses: actions/checkout@v3
38+
uses: actions/checkout@v4
3939
with:
4040
fetch-depth: 0
4141
-

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "ep_search",
33
"description": "Search through all pads for a string",
4-
"version": "0.0.24",
4+
"version": "0.0.25",
55
"author": {
66
"name": "John McLear",
77
"email": "john@mclear.co.uk",

0 commit comments

Comments
 (0)