the symlink from node_modules/ep_etherpad-lite to ./src is part of the git repository
parent
8793c4e225
commit
1702c7c34e
|
@ -23,7 +23,7 @@ jobs:
|
||||||
sudo apt update
|
sudo apt update
|
||||||
sudo apt install -y --no-install-recommends libreoffice libreoffice-pdfimport
|
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
|
run: bin/installDeps.sh
|
||||||
|
|
||||||
# configures some settings and runs npm run test
|
# configures some settings and runs npm run test
|
||||||
|
@ -49,7 +49,7 @@ jobs:
|
||||||
sudo apt update
|
sudo apt update
|
||||||
sudo apt install -y --no-install-recommends libreoffice libreoffice-pdfimport
|
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
|
run: bin/installDeps.sh
|
||||||
|
|
||||||
- name: Install etherpad plugins
|
- name: Install etherpad plugins
|
||||||
|
|
|
@ -19,7 +19,7 @@ jobs:
|
||||||
TRAVIS_JOB_NUMBER: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
|
TRAVIS_JOB_NUMBER: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
|
||||||
run: tests/frontend/travis/sauce_tunnel.sh
|
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
|
run: bin/installDeps.sh
|
||||||
|
|
||||||
- name: export GIT_HASH to env
|
- name: export GIT_HASH to env
|
||||||
|
@ -55,7 +55,7 @@ jobs:
|
||||||
TRAVIS_JOB_NUMBER: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
|
TRAVIS_JOB_NUMBER: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
|
||||||
run: tests/frontend/travis/sauce_tunnel.sh
|
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
|
run: bin/installDeps.sh
|
||||||
|
|
||||||
- name: Install etherpad plugins
|
- name: Install etherpad plugins
|
||||||
|
|
|
@ -17,7 +17,7 @@ jobs:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Install all dependencies and symlink for ep_etherpad-lite
|
- name: Install all dependencies
|
||||||
run: bin/installDeps.sh
|
run: bin/installDeps.sh
|
||||||
|
|
||||||
- name: Install etherpad-load-test
|
- name: Install etherpad-load-test
|
||||||
|
@ -39,7 +39,7 @@ jobs:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Install all dependencies and symlink for ep_etherpad-lite
|
- name: Install all dependencies
|
||||||
run: bin/installDeps.sh
|
run: bin/installDeps.sh
|
||||||
|
|
||||||
- name: Install etherpad-load-test
|
- name: Install etherpad-load-test
|
||||||
|
|
|
@ -30,7 +30,7 @@ jobs:
|
||||||
docker run -p 8081:80 --rm --network ep_net --ip 172.23.42.1 -d nginx-latest
|
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
|
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
|
run: bin/installDeps.sh
|
||||||
|
|
||||||
- name: run rate limit test
|
- name: run rate limit test
|
||||||
|
|
|
@ -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."
|
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
|
npm ci
|
||||||
) || {
|
) || {
|
||||||
rm -rf src/node_modules
|
rm -rf src/node_modules
|
||||||
|
rm -rf node_modules
|
||||||
|
git restore node_modules/ep_etherpad-lite
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -9,15 +9,8 @@ cmd /C node -e "" || ( echo "Please install node.js ( https://nodejs.org )" && e
|
||||||
echo _
|
echo _
|
||||||
echo Ensure that all dependencies are up to date... If this is the first time you have run Etherpad please be patient.
|
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
|
cmd /C npm ci || exit /B 1
|
||||||
|
|
||||||
cd /D "%~dp0\.."
|
|
||||||
|
|
||||||
echo _
|
echo _
|
||||||
echo Clearing cache...
|
echo Clearing cache...
|
||||||
del /S var\minified*
|
del /S var\minified*
|
||||||
|
|
|
@ -38,7 +38,7 @@ jobs:
|
||||||
# Etherpad plugins from piggybacking off of ep_etherpad-lite's
|
# Etherpad plugins from piggybacking off of ep_etherpad-lite's
|
||||||
# devDependencies. If we had that, we could change this line to only
|
# devDependencies. If we had that, we could change this line to only
|
||||||
# install production dependencies.
|
# install production dependencies.
|
||||||
- run: cd ../etherpad-lite/src && npm ci
|
- run: cd ../etherpad-lite && npm ci
|
||||||
- run: npm ci
|
- run: npm ci
|
||||||
# This runs some sanity checks and creates a symlink at
|
# This runs some sanity checks and creates a symlink at
|
||||||
# node_modules/ep_etherpad-lite that points to ../../etherpad-lite/src.
|
# node_modules/ep_etherpad-lite that points to ../../etherpad-lite/src.
|
||||||
|
|
|
@ -42,7 +42,7 @@ jobs:
|
||||||
- "mv ../[plugin_name] node_modules"
|
- "mv ../[plugin_name] node_modules"
|
||||||
- "bin/installDeps.sh"
|
- "bin/installDeps.sh"
|
||||||
- "export GIT_HASH=$(git rev-parse --verify --short HEAD)"
|
- "export GIT_HASH=$(git rev-parse --verify --short HEAD)"
|
||||||
- "cd src && npm install && cd -"
|
- "npm install"
|
||||||
script:
|
script:
|
||||||
- "tests/frontend/travis/runnerBackend.sh"
|
- "tests/frontend/travis/runnerBackend.sh"
|
||||||
- name: "Test the Frontend"
|
- name: "Test the Frontend"
|
||||||
|
|
Loading…
Reference in New Issue