From 7f8d3bbd322a53ffb73c036368ccdaacd37ce28c Mon Sep 17 00:00:00 2001 From: Richard Hansen Date: Mon, 15 Feb 2021 19:10:55 -0500 Subject: [PATCH] tests: Pass `--legacy-peer-deps` with npm >= 7.x This works around https://github.com/npm/cli/issues/2199. --- .github/workflows/backend-tests.yml | 5 ++++- .github/workflows/frontend-admin-tests.yml | 6 +++++- .github/workflows/frontend-tests.yml | 5 ++++- .github/workflows/load-test.yml | 5 ++++- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.github/workflows/backend-tests.yml b/.github/workflows/backend-tests.yml index 7ab58c410cf5..3d783aea05d4 100644 --- a/.github/workflows/backend-tests.yml +++ b/.github/workflows/backend-tests.yml @@ -59,7 +59,10 @@ jobs: - name: Install Etherpad plugins run: > - npm install + npm_version=$(npm --version) || exit 1; + npm_major=${npm_version%%.*}; + flags=; [ $npm_major -lt 7 ] || flags=--legacy-peer-deps; + npm install $flags ep_align ep_author_hover ep_cursortrace diff --git a/.github/workflows/frontend-admin-tests.yml b/.github/workflows/frontend-admin-tests.yml index e42aa3bb25c5..c76a155e8e2d 100644 --- a/.github/workflows/frontend-admin-tests.yml +++ b/.github/workflows/frontend-admin-tests.yml @@ -28,7 +28,11 @@ jobs: # We intentionally install a much old ep_align version to test update minor versions - name: Install etherpad plugins - run: npm install ep_align@0.2.27 + run: > + npm_version=$(npm --version) || exit 1; + npm_major=${npm_version%%.*}; + flags=; [ $npm_major -lt 7 ] || flags=--legacy-peer-deps; + npm install $flags ep_align@0.2.27 # Nuke plugin tests - name: Install etherpad plugins diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml index 00c8dd6b5312..8047d72b6104 100644 --- a/.github/workflows/frontend-tests.yml +++ b/.github/workflows/frontend-tests.yml @@ -65,7 +65,10 @@ jobs: - name: Install Etherpad plugins run: > - npm install + npm_version=$(npm --version) || exit 1; + npm_major=${npm_version%%.*}; + flags=; [ $npm_major -lt 7 ] || flags=--legacy-peer-deps; + npm install $flags ep_align ep_author_hover ep_cursortrace diff --git a/.github/workflows/load-test.yml b/.github/workflows/load-test.yml index 98379dfe83cd..21e3e9a0aaf0 100644 --- a/.github/workflows/load-test.yml +++ b/.github/workflows/load-test.yml @@ -52,7 +52,10 @@ jobs: - name: Install etherpad plugins run: > - npm install + npm_version=$(npm --version) || exit 1; + npm_major=${npm_version%%.*}; + flags=; [ $npm_major -lt 7 ] || flags=--legacy-peer-deps; + npm install $flags ep_align ep_author_hover ep_cursortrace