From 9df09bee5a829a8b8f1e8090456a9a5df2339327 Mon Sep 17 00:00:00 2001
From: SamTV12345 <40429738+samtv12345@users.noreply.github.com>
Date: Sat, 10 Feb 2024 14:52:09 +0100
Subject: [PATCH] Fixed.

---
 .github/workflows/backend-tests.yml           |  4 +--
 .github/workflows/frontend-admin-tests.yml    |  2 +-
 .github/workflows/load-test.yml               | 36 +++++++++++++++++--
 .../workflows/upgrade-from-latest-release.yml |  2 +-
 4 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/backend-tests.yml b/.github/workflows/backend-tests.yml
index 4365150fe..ebbb83c87 100644
--- a/.github/workflows/backend-tests.yml
+++ b/.github/workflows/backend-tests.yml
@@ -103,7 +103,7 @@ jobs:
         # The --legacy-peer-deps flag is required to work around a bug in npm v7:
         # https://github.com/npm/cli/issues/2199
         run: >
-          pnpm install --no-save
+          pnpm install
           ep_align
           ep_author_hover
           ep_cursortrace
@@ -215,7 +215,7 @@ jobs:
         # The --legacy-peer-deps flag is required to work around a bug in npm
         # v7: https://github.com/npm/cli/issues/2199
         run: >
-          pnpm install --no-save --legacy-peer-deps
+          pnpm install
           ep_align
           ep_author_hover
           ep_cursortrace
diff --git a/.github/workflows/frontend-admin-tests.yml b/.github/workflows/frontend-admin-tests.yml
index d67729cb5..56c5d612e 100644
--- a/.github/workflows/frontend-admin-tests.yml
+++ b/.github/workflows/frontend-admin-tests.yml
@@ -53,7 +53,7 @@ jobs:
         # We intentionally install an old ep_align version to test upgrades 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
-        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
       # plugin's dependencies, otherwise npm will try to hoist common
       # dependencies by removing them from src/node_modules and installing them
diff --git a/.github/workflows/load-test.yml b/.github/workflows/load-test.yml
index 0b7cfacc8..79c93592c 100644
--- a/.github/workflows/load-test.yml
+++ b/.github/workflows/load-test.yml
@@ -65,15 +65,31 @@ jobs:
         uses: actions/setup-node@v4
         with:
           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
-        run: sudo npm install -g etherpad-load-test
+        run: sudo pnpm install -g etherpad-load-test
       -
         name: Install etherpad plugins
         # The --legacy-peer-deps flag is required to work around a bug in npm v7:
         # https://github.com/npm/cli/issues/2199
         run: >
-          pnpm install --no-save
+          pnpm install
           ep_align
           ep_author_hover
           ep_cursortrace
@@ -118,6 +134,22 @@ jobs:
         uses: actions/setup-node@v4
         with:
           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
         run: src/bin/installDeps.sh
diff --git a/.github/workflows/upgrade-from-latest-release.yml b/.github/workflows/upgrade-from-latest-release.yml
index 681e9d67f..8a65b8f25 100644
--- a/.github/workflows/upgrade-from-latest-release.yml
+++ b/.github/workflows/upgrade-from-latest-release.yml
@@ -50,7 +50,7 @@ jobs:
         # The --legacy-peer-deps flag is required to work around a bug in npm
         # v7: https://github.com/npm/cli/issues/2199
         run: >
-          pnpm install --no-save
+          pnpm install
           ep_align
           ep_author_hover
           ep_cursortrace