Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-15 20:54:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

split up installing static webserver and riot copy

Browse Source 
so we can just do the latter for the e2e tests on CI
This commit is contained in:
Bruno Windels 2019-10-18 17:18:18 +02:00
parent dca968375d
commit b03ebb964b
4 changed files with 32 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/ci/end-to-end-tests.sh
View File

@ -34,8 +34,8 @@ ln -s $REACT_SDK_DIR/$RIOT_WEB_DIR riot/riot-web
# CHROME_PATH=$(which google-chrome-stable) ./run.sh
echo "--- Install synapse & other dependencies"
./install.sh
# install (only) static webserver to server symlinked local copy of riot
./riot/install.sh --without-riot
# install static webserver to server symlinked local copy of riot
./riot/install-webserver.sh
mkdir logs
echo "+++ Running end-to-end tests"
TESTS_STARTED=1

5
test/end-to-end-tests/install.sh
View File

@ -2,7 +2,6 @@
# run with PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true sh install.sh if chrome is already installed
set -e
./synapse/install.sh
# both CI and local testing don't need a Riot fetched from master,
# so not installing this by default anymore
# ./riot/install.sh
# local testing doesn't need a Riot fetched from master,
# so not installing that by default
yarn install

21
test/end-to-end-tests/riot/install-webserver.sh Executable file
View File

@ -0,0 +1,21 @@
#!/bin/bash
set -e
BASE_DIR=$(cd $(dirname $0) && pwd)
cd $BASE_DIR
# Install ComplexHttpServer (a drop in replacement for Python's SimpleHttpServer
# but with support for multiple threads) into a virtualenv.
(
virtualenv -p python3 env
source env/bin/activate
# Having been bitten by pip SSL fail too many times, I don't trust the existing pip
# to be able to --upgrade itself, so grab a new one fresh from source.
curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
python get-pip.py
rm get-pip.py
pip install ComplexHttpServer
deactivate
)

29
test/end-to-end-tests/riot/install.sh
View File

@ -2,39 +2,11 @@
set -e
RIOT_BRANCH=develop
with_riot=1
for i in $@; do
if [ "$i" == "--without-riot" ] ; then
with_riot=0
fi
done
BASE_DIR=$(cd $(dirname $0) && pwd)
cd $BASE_DIR
# Install ComplexHttpServer (a drop in replacement for Python's SimpleHttpServer
# but with support for multiple threads) into a virtualenv.
(
virtualenv -p python3 env
source env/bin/activate
# Having been bitten by pip SSL fail too many times, I don't trust the existing pip
# to be able to --upgrade itself, so grab a new one fresh from source.
curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
python get-pip.py
rm get-pip.py
pip install ComplexHttpServer
deactivate
)
if [ -d $BASE_DIR/riot-web ]; then
echo "riot is already installed"
exit
fi
if [ $with_riot -eq 1 ]; then
curl -L https://github.com/vector-im/riot-web/archive/${RIOT_BRANCH}.zip --output riot.zip
unzip -q riot.zip
rm riot.zip
@ -42,4 +14,3 @@ if [ $with_riot -eq 1 ]; then
cd riot-web
yarn install
yarn run build
fi