diff --git a/.github/workflows/backend-tests.yml b/.github/workflows/backend-tests.yml index e50491d23..1735c1166 100644 --- a/.github/workflows/backend-tests.yml +++ b/.github/workflows/backend-tests.yml @@ -23,7 +23,7 @@ jobs: sudo apt update sudo apt install -y --no-install-recommends libreoffice libreoffice-pdfimport - - name: Install all dependencies and symlink for ep_etherpad-lite + - name: Install all dependencies run: bin/installDeps.sh # configures some settings and runs npm run test @@ -49,7 +49,7 @@ jobs: sudo apt update sudo apt install -y --no-install-recommends libreoffice libreoffice-pdfimport - - name: Install all dependencies and symlink for ep_etherpad-lite + - name: Install all dependencies run: bin/installDeps.sh - name: Install etherpad plugins diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml index 3b178622e..fa2afb221 100644 --- a/.github/workflows/frontend-tests.yml +++ b/.github/workflows/frontend-tests.yml @@ -19,7 +19,7 @@ jobs: TRAVIS_JOB_NUMBER: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }} run: tests/frontend/travis/sauce_tunnel.sh - - name: Install all dependencies and symlink for ep_etherpad-lite + - name: Install all dependencies run: bin/installDeps.sh - name: export GIT_HASH to env @@ -55,7 +55,7 @@ jobs: TRAVIS_JOB_NUMBER: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }} run: tests/frontend/travis/sauce_tunnel.sh - - name: Install all dependencies and symlink for ep_etherpad-lite + - name: Install all dependencies run: bin/installDeps.sh - name: Install etherpad plugins diff --git a/.github/workflows/load-test.yml b/.github/workflows/load-test.yml index 095adc785..3cf6d76b2 100644 --- a/.github/workflows/load-test.yml +++ b/.github/workflows/load-test.yml @@ -17,7 +17,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 - - name: Install all dependencies and symlink for ep_etherpad-lite + - name: Install all dependencies run: bin/installDeps.sh - name: Install etherpad-load-test @@ -39,7 +39,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 - - name: Install all dependencies and symlink for ep_etherpad-lite + - name: Install all dependencies run: bin/installDeps.sh - name: Install etherpad-load-test diff --git a/.github/workflows/rate-limit.yml b/.github/workflows/rate-limit.yml index 4bdfc2194..b631ed3bf 100644 --- a/.github/workflows/rate-limit.yml +++ b/.github/workflows/rate-limit.yml @@ -30,7 +30,7 @@ jobs: docker run -p 8081:80 --rm --network ep_net --ip 172.23.42.1 -d nginx-latest docker run --rm --network ep_net --ip 172.23.42.3 --name anotherip -dt anotherip - - name: install dependencies and create symlink for ep_etherpad-lite + - name: install dependencies run: bin/installDeps.sh - name: run rate limit test diff --git a/bin/installDeps.sh b/bin/installDeps.sh index bdce38fc7..5f1c8ff42 100755 --- a/bin/installDeps.sh +++ b/bin/installDeps.sh @@ -35,13 +35,11 @@ fi log "Ensure that all dependencies are up to date... If this is the first time you have run Etherpad please be patient." ( - mkdir -p node_modules - cd node_modules - [ -e ep_etherpad-lite ] || ln -s ../src ep_etherpad-lite - cd ep_etherpad-lite npm ci ) || { rm -rf src/node_modules + rm -rf node_modules + git restore node_modules/ep_etherpad-lite exit 1 } diff --git a/bin/installOnWindows.bat b/bin/installOnWindows.bat index 3c6bf58c0..f728a1c98 100644 --- a/bin/installOnWindows.bat +++ b/bin/installOnWindows.bat @@ -9,15 +9,8 @@ cmd /C node -e "" || ( echo "Please install node.js ( https://nodejs.org )" && e echo _ echo Ensure that all dependencies are up to date... If this is the first time you have run Etherpad please be patient. -mkdir node_modules -cd /D node_modules -mklink /D "ep_etherpad-lite" "..\src" - -cd /D "ep_etherpad-lite" cmd /C npm ci || exit /B 1 -cd /D "%~dp0\.." - echo _ echo Clearing cache... del /S var\minified* diff --git a/bin/plugins/lib/npmpublish.yml b/bin/plugins/lib/npmpublish.yml index 8d94ce88a..8a0eb7d1c 100644 --- a/bin/plugins/lib/npmpublish.yml +++ b/bin/plugins/lib/npmpublish.yml @@ -38,7 +38,7 @@ jobs: # Etherpad plugins from piggybacking off of ep_etherpad-lite's # devDependencies. If we had that, we could change this line to only # install production dependencies. - - run: cd ../etherpad-lite/src && npm ci + - run: cd ../etherpad-lite && npm ci - run: npm ci # This runs some sanity checks and creates a symlink at # node_modules/ep_etherpad-lite that points to ../../etherpad-lite/src. diff --git a/bin/plugins/lib/travis.yml b/bin/plugins/lib/travis.yml index 099d7e445..05f823486 100644 --- a/bin/plugins/lib/travis.yml +++ b/bin/plugins/lib/travis.yml @@ -42,7 +42,7 @@ jobs: - "mv ../[plugin_name] node_modules" - "bin/installDeps.sh" - "export GIT_HASH=$(git rev-parse --verify --short HEAD)" - - "cd src && npm install && cd -" + - "npm install" script: - "tests/frontend/travis/runnerBackend.sh" - name: "Test the Frontend"