mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-05-08 08:01:02 -04:00
Fixed.
This commit is contained in:
parent
d5063aeb48
commit
9df09bee5a
4 changed files with 38 additions and 6 deletions
4
.github/workflows/backend-tests.yml
vendored
4
.github/workflows/backend-tests.yml
vendored
|
@ -103,7 +103,7 @@ jobs:
|
||||||
# The --legacy-peer-deps flag is required to work around a bug in npm v7:
|
# The --legacy-peer-deps flag is required to work around a bug in npm v7:
|
||||||
# https://github.com/npm/cli/issues/2199
|
# https://github.com/npm/cli/issues/2199
|
||||||
run: >
|
run: >
|
||||||
pnpm install --no-save
|
pnpm install
|
||||||
ep_align
|
ep_align
|
||||||
ep_author_hover
|
ep_author_hover
|
||||||
ep_cursortrace
|
ep_cursortrace
|
||||||
|
@ -215,7 +215,7 @@ jobs:
|
||||||
# The --legacy-peer-deps flag is required to work around a bug in npm
|
# The --legacy-peer-deps flag is required to work around a bug in npm
|
||||||
# v7: https://github.com/npm/cli/issues/2199
|
# v7: https://github.com/npm/cli/issues/2199
|
||||||
run: >
|
run: >
|
||||||
pnpm install --no-save --legacy-peer-deps
|
pnpm install
|
||||||
ep_align
|
ep_align
|
||||||
ep_author_hover
|
ep_author_hover
|
||||||
ep_cursortrace
|
ep_cursortrace
|
||||||
|
|
2
.github/workflows/frontend-admin-tests.yml
vendored
2
.github/workflows/frontend-admin-tests.yml
vendored
|
@ -53,7 +53,7 @@ jobs:
|
||||||
# We intentionally install an old ep_align version to test upgrades to
|
# We intentionally install an old ep_align version to test upgrades to
|
||||||
# the minor version number. The --legacy-peer-deps flag is required to
|
# the minor version number. The --legacy-peer-deps flag is required to
|
||||||
# work around a bug in npm v7: https://github.com/npm/cli/issues/2199
|
# work around a bug in npm v7: https://github.com/npm/cli/issues/2199
|
||||||
run: npm install --no-save --legacy-peer-deps ep_align@0.2.27
|
run: pnpm install --legacy-peer-deps ep_align@0.2.27
|
||||||
# Etherpad core dependencies must be installed after installing the
|
# Etherpad core dependencies must be installed after installing the
|
||||||
# plugin's dependencies, otherwise npm will try to hoist common
|
# plugin's dependencies, otherwise npm will try to hoist common
|
||||||
# dependencies by removing them from src/node_modules and installing them
|
# dependencies by removing them from src/node_modules and installing them
|
||||||
|
|
36
.github/workflows/load-test.yml
vendored
36
.github/workflows/load-test.yml
vendored
|
@ -65,15 +65,31 @@ jobs:
|
||||||
uses: actions/setup-node@v4
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 20
|
node-version: 20
|
||||||
|
- uses: pnpm/action-setup@v3
|
||||||
|
name: Install pnpm
|
||||||
|
with:
|
||||||
|
version: 8
|
||||||
|
run_install: false
|
||||||
|
- name: Get pnpm store directory
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
|
||||||
|
- uses: actions/cache@v3
|
||||||
|
name: Setup pnpm cache
|
||||||
|
with:
|
||||||
|
path: ${{ env.STORE_PATH }}
|
||||||
|
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
|
||||||
|
restore-keys: |
|
||||||
|
${{ runner.os }}-pnpm-store-
|
||||||
-
|
-
|
||||||
name: Install etherpad-load-test
|
name: Install etherpad-load-test
|
||||||
run: sudo npm install -g etherpad-load-test
|
run: sudo pnpm install -g etherpad-load-test
|
||||||
-
|
-
|
||||||
name: Install etherpad plugins
|
name: Install etherpad plugins
|
||||||
# The --legacy-peer-deps flag is required to work around a bug in npm v7:
|
# The --legacy-peer-deps flag is required to work around a bug in npm v7:
|
||||||
# https://github.com/npm/cli/issues/2199
|
# https://github.com/npm/cli/issues/2199
|
||||||
run: >
|
run: >
|
||||||
pnpm install --no-save
|
pnpm install
|
||||||
ep_align
|
ep_align
|
||||||
ep_author_hover
|
ep_author_hover
|
||||||
ep_cursortrace
|
ep_cursortrace
|
||||||
|
@ -118,6 +134,22 @@ jobs:
|
||||||
uses: actions/setup-node@v4
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 20
|
node-version: 20
|
||||||
|
- uses: pnpm/action-setup@v3
|
||||||
|
name: Install pnpm
|
||||||
|
with:
|
||||||
|
version: 8
|
||||||
|
run_install: false
|
||||||
|
- name: Get pnpm store directory
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
|
||||||
|
- uses: actions/cache@v3
|
||||||
|
name: Setup pnpm cache
|
||||||
|
with:
|
||||||
|
path: ${{ env.STORE_PATH }}
|
||||||
|
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
|
||||||
|
restore-keys: |
|
||||||
|
${{ runner.os }}-pnpm-store-
|
||||||
-
|
-
|
||||||
name: Install all dependencies and symlink for ep_etherpad-lite
|
name: Install all dependencies and symlink for ep_etherpad-lite
|
||||||
run: src/bin/installDeps.sh
|
run: src/bin/installDeps.sh
|
||||||
|
|
|
@ -50,7 +50,7 @@ jobs:
|
||||||
# The --legacy-peer-deps flag is required to work around a bug in npm
|
# The --legacy-peer-deps flag is required to work around a bug in npm
|
||||||
# v7: https://github.com/npm/cli/issues/2199
|
# v7: https://github.com/npm/cli/issues/2199
|
||||||
run: >
|
run: >
|
||||||
pnpm install --no-save
|
pnpm install
|
||||||
ep_align
|
ep_align
|
||||||
ep_author_hover
|
ep_author_hover
|
||||||
ep_cursortrace
|
ep_cursortrace
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue